From 39f9848ca1374fb84b5364d1bfd64882c4f9a243 Mon Sep 17 00:00:00 2001 From: goga-m Date: Tue, 14 Nov 2017 17:52:50 +0200 Subject: [PATCH] Promisify admin-support --- lib/admin/admin-server.js | 2 +- lib/admin/admin-support.js | 8 +++++--- lib/logs.js | 9 --------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/admin/admin-server.js b/lib/admin/admin-server.js index 5cde75c1..1dd84223 100644 --- a/lib/admin/admin-server.js +++ b/lib/admin/admin-server.js @@ -340,5 +340,5 @@ function run () { const supportLog = `lamassu-support-server listening on port ${supportPort}` webServer.listen(serverPort, () => console.log(serverLog)) - supportServer.run(supportPort, () => console.log(supportLog)) + supportServer.run(supportPort).then(console.log(supportLog)) } diff --git a/lib/admin/admin-support.js b/lib/admin/admin-support.js index 282abf95..0ac54414 100644 --- a/lib/admin/admin-support.js +++ b/lib/admin/admin-support.js @@ -57,9 +57,11 @@ app.post('/api/support_logs', (req, res, next) => { .catch(next) }) -function run (port, cb) { - const webServer = https.createServer(certOptions, app) - webServer.listen(port || 443, cb) +function run (port) { + return new Promise((resolve, reject) => { + const webServer = https.createServer(certOptions, app) + webServer.listen(port, resolve) + }) } module.exports = { run } diff --git a/lib/logs.js b/lib/logs.js index 5868e2dd..a88168e0 100644 --- a/lib/logs.js +++ b/lib/logs.js @@ -69,15 +69,6 @@ function update (deviceId, logLines) { * @returns {array} Array of logs for the requested machinej */ function getMachineLogs (deviceId, until = new Date().toISOString()) { - const defaults = { - logs: [], - currentMachine: { - name: '', - deviceId: '' - } - } - if (!deviceId) return defaults - const sql = `select id, log_level, timestamp, message from logs where device_id=$1 and timestamp <= $3