Made startup logs more explicit
parent
25e4b392e1
commit
1f6bbabd5c
|
@ -5,11 +5,11 @@ const fs = require('fs')
|
||||||
const path = require('path')
|
const path = require('path')
|
||||||
const debug = require('debug')('tracman-demo')
|
const debug = require('debug')('tracman-demo')
|
||||||
|
|
||||||
module.exports = (io) => {
|
module.exports = (io, filename='demo.txt') => {
|
||||||
return new Promise( (resolve, reject) => {
|
return new Promise( (resolve, reject) => {
|
||||||
|
|
||||||
// File is space-seperated: delay, lat, lon, dir, spd
|
// File is space-seperated: delay, lat, lon, dir, spd
|
||||||
fs.readFile(path.join(__dirname, '/demo.txt'), (err, data) => {
|
fs.readFile(path.join(__dirname, filename), (err, data) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.error(err.message)
|
console.error(err.message)
|
||||||
reject()
|
reject()
|
||||||
|
@ -38,7 +38,7 @@ module.exports = (io) => {
|
||||||
}
|
}
|
||||||
})(5667)
|
})(5667)
|
||||||
|
|
||||||
console.log(' Demo running')
|
console.log(` Demo running from ./${filename}`)
|
||||||
resolve()
|
resolve()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,12 @@ module.exports = {
|
||||||
return new Promise( (resolve, reject) => {
|
return new Promise( (resolve, reject) => {
|
||||||
transporter.verify()
|
transporter.verify()
|
||||||
.then( (success) => {
|
.then( (success) => {
|
||||||
console.log(` SMTP${(success)?'':' not'} ready`)
|
if (success) {
|
||||||
|
console.log(` Nodemailer connected to ${env.mailserver}:${env.mailport} as ${env.mailauth.user}`)
|
||||||
|
resolve()
|
||||||
|
} else reject(new Error(
|
||||||
|
`Nodemailer failed to connect to SMTP server at smtp:/\/${env.mailauth.user}:${env.mailauth.pass}@${env.mailserver}:${env.mailport}`
|
||||||
|
))
|
||||||
resolve()
|
resolve()
|
||||||
}).catch( (err) => {
|
}).catch( (err) => {
|
||||||
console.log(err.stack)
|
console.log(err.stack)
|
||||||
|
|
12
server.js
12
server.js
|
@ -36,7 +36,7 @@ let ready_promise_list = []
|
||||||
keepAlive: true
|
keepAlive: true
|
||||||
})
|
})
|
||||||
.then( (db) => {
|
.then( (db) => {
|
||||||
console.log(` Mongoose connected to ${db.name} database`)
|
console.log(` Mongoose connected to ${env.mongoSetup}`)
|
||||||
resolve()
|
resolve()
|
||||||
} )
|
} )
|
||||||
.catch( (err) => {
|
.catch( (err) => {
|
||||||
|
@ -170,7 +170,7 @@ let ready_promise_list = []
|
||||||
}
|
}
|
||||||
|
|
||||||
/* RUNTIME */
|
/* RUNTIME */
|
||||||
console.log(`Starting Tracman server in ${env.mode} mode...`)
|
console.log(`Starting ${env.mode} server at ${__dirname}...`)
|
||||||
|
|
||||||
// Test SMTP server
|
// Test SMTP server
|
||||||
ready_promise_list.push(mail.verify())
|
ready_promise_list.push(mail.verify())
|
||||||
|
@ -179,7 +179,7 @@ ready_promise_list.push(mail.verify())
|
||||||
ready_promise_list.push( new Promise( (resolve, reject) => {
|
ready_promise_list.push( new Promise( (resolve, reject) => {
|
||||||
http.listen(env.port, () => {
|
http.listen(env.port, () => {
|
||||||
|
|
||||||
console.log(` Listening on port ${env.port}`)
|
console.log(` Express listening on ${env.url}`)
|
||||||
resolve()
|
resolve()
|
||||||
|
|
||||||
// Check for clients for each user
|
// Check for clients for each user
|
||||||
|
@ -201,7 +201,11 @@ ready_promise_list.push( new Promise( (resolve, reject) => {
|
||||||
ready_promise_list.push( demo(io) )
|
ready_promise_list.push( demo(io) )
|
||||||
|
|
||||||
// Mark everything when working correctly
|
// Mark everything when working correctly
|
||||||
Promise.all(ready_promise_list).then( () => {
|
Promise.all(ready_promise_list.map(
|
||||||
|
// Also wait for rejected promises
|
||||||
|
// https://stackoverflow.com/a/36115549/3006854
|
||||||
|
p => p.catch(e => e)
|
||||||
|
)).then( () => {
|
||||||
console.log('Tracman server is running properly\n')
|
console.log('Tracman server is running properly\n')
|
||||||
app.emit('ready') // Used for tests
|
app.emit('ready') // Used for tests
|
||||||
}).catch( (err) => {
|
}).catch( (err) => {
|
||||||
|
|
Loading…
Reference in New Issue