X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=server.js;h=d5b206c5fafca3447296f53b8aadcce31d19bcad;hb=refs%2Fheads%2Fv1.3-dev;hp=76580972919c642d3d0c09de1080e038a003a3a9;hpb=38aba0869dc3ade99d439e74cbc6239b4fa1f632;p=websub-hub

diff --git a/server.js b/server.js
index 7658097..d5b206c 100644
--- a/server.js
+++ b/server.js
@@ -1,6 +1,7 @@
 'use strict';
 
-const http = require('http');
+const http = require('node:http');
+const { AsyncLocalStorage } = require('node:async_hooks');
 const DB = require('./src/db');
 const Logger = require('./src/logger');
 const Service = require('./src/service');
@@ -16,22 +17,28 @@ const ADDR = process.env.LISTEN_ADDR || '127.0.0.1';
 (async function main () {
   let config, logger, db, service;
   try {
+    // This provides an async context store for persisting unique log data per request, id est a requestId.
+    const asyncLocalStorage = new AsyncLocalStorage();
+
     config = new Config(process.env.NODE_ENV);
-    logger = new Logger(config);
+    logger = new Logger(config.logger, { nodeId: config.nodeId }, asyncLocalStorage);
     db = new DB(logger, config);
     await db.initialize();
-    service = new Service(logger, db, config);
+    service = new Service(logger, db, config, asyncLocalStorage);
 
-    http.createServer((req, res) => {
-      service.dispatch(req, res);
+    http.createServer(async (req, res) => {
+      await asyncLocalStorage.run({}, async () => {
+        return 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?.listener && await db.listener.stop();
   }
 })();
\ No newline at end of file