Merge branch 'v1.3-dev' as v1.3.11

[websub-hub] / server.js

diff --git a/server.js b/server.js
index 985e57552e124562df908d53d1349bbdd4da3bdd..49ce8f6ea6971169ae958ef0c4d4d9227133a8d2 100644 (file)
--- a/server.js
+++ b/server.js
@@ -19,19 +19,20 @@ const ADDR = process.env.LISTEN_ADDR || '127.0.0.1';
     config = new Config(process.env.NODE_ENV);
     logger = new Logger(config);
     db = new DB(logger, config);
-    await db.schemaCheck();
+    await db.initialize();
     service = new Service(logger, db, config);
 
     http.createServer((req, res) => {
       service.dispatch(req, res);
     }).listen(PORT, ADDR, (err) => {
       if (err) {
-        logger.error(_scope, 'error starting server', err);
+        logger.error(_scope, 'error creating server', err);
         throw err;
       }
-      logger.info(_scope, `server (version ${version}) started on ${ADDR}:${PORT}`);
+      logger.info(_scope, 'server started', { version, listenAddress: ADDR, listenPort: PORT });
     });
   } catch (e) {
-    logger.error(_scope, 'error starting server', e);
+    (logger || console).error(_scope, 'error starting server', e);
+    db && db.listener && await db.listener.stop();
   }
 })();
\ No newline at end of file