moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor sys log updates

This commit is contained in:
Bryan Ashby 2023-04-26 19:11:38 -06:00
parent 0c1785c462
commit a5a3a63b00
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/servers/content/web.js
View File

@ -1,5 +1,5 @@
// ENiGMA½ // ENiGMA½
const SysLog = require('../../logger.js').log; const SysLogger = require('../../logger.js').log;
const ServerModule = require('../../server_module.js').ServerModule; const ServerModule = require('../../server_module.js').ServerModule;
const Config = require('../../config.js').get; const Config = require('../../config.js').get;
const { Errors } = require('../../enig_error.js'); const { Errors } = require('../../enig_error.js');
@ -132,14 +132,14 @@ exports.getModule = class WebServerModule extends ServerModule {
try { try {
const normalizedName = _.camelCase(module.moduleInfo.name); const normalizedName = _.camelCase(module.moduleInfo.name);
if (!WebHandlerModule.isEnabled(normalizedName)) { if (!WebHandlerModule.isEnabled(normalizedName)) {
SysLog.info( SysLogger.info(
{ moduleName: normalizedName }, { moduleName: normalizedName },
'Web handler module not enabled' 'Web handler module not enabled'
); );
return nextModule(null); return nextModule(null);
} }
SysLog.info( SysLogger.info(
{ moduleName: normalizedName }, { moduleName: normalizedName },
'Initializing web handler module' 'Initializing web handler module'
); );
@ -148,7 +148,7 @@ exports.getModule = class WebServerModule extends ServerModule {
return nextModule(err); return nextModule(err);
}); });
} catch (e) { } catch (e) {
SysLog.error( SysLogger.error(
{ error: e.message }, { error: e.message },
'Exception caught loading web handler' 'Exception caught loading web handler'
); );
@ -170,12 +170,12 @@ exports.getModule = class WebServerModule extends ServerModule {
if (this[name]) { if (this[name]) {
const port = parseInt(config.contentServers.web[service].port); const port = parseInt(config.contentServers.web[service].port);
if (isNaN(port)) { if (isNaN(port)) {
SysLog.error( SysLogger.error(
{ {
port: config.contentServers.web[service].port, port: config.contentServers.web[service].port,
server: ModuleInfo.name, server: ModuleInfo.name,
}, },
`Invalid port (${service})` `Invalid web port (${service})`
); );
return nextService( return nextService(
Errors.Invalid( Errors.Invalid(
@ -205,16 +205,13 @@ exports.getModule = class WebServerModule extends ServerModule {
route = new Route(route); route = new Route(route);
if (!route.isValid()) { if (!route.isValid()) {
SysLog.error( SysLogger.error({ route: route }, 'Cannot add invalid route');
{ route: route },
'Cannot add route: missing or invalid required members'
);
return false; return false;
} }
const routeKey = route.getRouteKey(); const routeKey = route.getRouteKey();
if (routeKey in this.routes) { if (routeKey in this.routes) {
SysLog.warn( SysLogger.warn(
{ route: route, routeKey: routeKey }, { route: route, routeKey: routeKey },
'Cannot add route: duplicate method/path combination exists' 'Cannot add route: duplicate method/path combination exists'
); );