ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit c8291a1d8c63e67eff2b26c54f93e67e6ff8e17e
parent b62d8cacba073fbe499a8d9a6a6094d7064f8289
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Mon, 26 Oct 2015 09:18:42 +0300

Update tools/serve.js script

Diffstat:
Mtools/serve.js | 29++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/tools/serve.js b/tools/serve.js @@ -17,25 +17,24 @@ import watch from './lib/watch'; function serve() { return new Promise((resolve, reject) => { function start() { - const server = cp.spawn('node', [path.join(__dirname, '../build/server.js')], { - env: Object.assign({ NODE_ENV: 'development' }, process.env), - silent: false, - }); - + const server = cp.spawn( + 'node', + [path.join(__dirname, '../build/server.js')], + { + env: Object.assign({ NODE_ENV: 'development' }, process.env), + silent: false, + } + ); server.stdout.on('data', data => { - const message = data.toString(); - if (message.match(' running ')) { - console.log(message.trim()); + let time = new Date().toTimeString(); + time = time.replace(/.*(\d{2}:\d{2}:\d{2}).*/, '$1'); + process.stdout.write(`[${time}] `); + process.stdout.write(data); + if (data.toString('utf8').includes('The server is running at')) { resolve(); - } else { - console.log(message); } }); - - server.stderr.once('data', data => { - reject(data.toString()); - }); - + server.stderr.on('data', data => process.stderr.write(data)); server.on('error', err => reject(err)); process.on('exit', () => server.kill('SIGTERM')); return server;