update dependency, fixes for logger update

[websub-hub] / server.js

diff --git a/server.js b/server.js
index 49ce8f6ea6971169ae958ef0c4d4d9227133a8d2..c12d19a778ebb195261b49938a8a014b1c89626b 100644 (file)
--- 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,14 +17,17 @@ const ADDR = process.env.LISTEN_ADDR || '127.0.0.1';
 (async function main () {
   let config, logger, db, service;
   try {
+    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 () => {
+        await service.dispatch(req, res);
+      });
     }).listen(PORT, ADDR, (err) => {
       if (err) {
         logger.error(_scope, 'error creating server', err);
@@ -33,6 +37,6 @@ const ADDR = process.env.LISTEN_ADDR || '127.0.0.1';
     });
   } catch (e) {
     (logger || console).error(_scope, 'error starting server', e);
-    db && db.listener && await db.listener.stop();
+    db?.listener && await db.listener.stop();
   }
 })();
\ No newline at end of file