projects
/
websub-hub
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v1.3-dev'
[websub-hub]
/
server.js
diff --git
a/server.js
b/server.js
index 985e57552e124562df908d53d1349bbdd4da3bdd..d5b206c5fafca3447296f53b8aadcce31d19bcad 100644
(file)
--- a/
server.js
+++ b/
server.js
@@
-1,6
+1,7
@@
'use strict';
'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');
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 {
(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);
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);
db = new DB(logger, config);
- await db.
schemaCheck
();
- service = new Service(logger, db, config);
+ await db.
initialize
();
+ 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) {
}).listen(PORT, ADDR, (err) => {
if (err) {
- logger.error(_scope, 'error
star
ting server', err);
+ logger.error(_scope, 'error
crea
ting server', err);
throw 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) {
});
} 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
}
})();
\ No newline at end of file