Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BE-880 Fix incorrect multi-process logging #260

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .eslintrc.json
Expand Up @@ -398,7 +398,9 @@
"sqlcharacter",
"peerlist",
"www",
"craetedat"
"craetedat",
"tcp",
"appender"
],
"skipWordIfMatch": [
"^\\d+px",
Expand Down
25 changes: 0 additions & 25 deletions app/common/commonUtils.ts

This file was deleted.

91 changes: 57 additions & 34 deletions app/common/helper.ts
Expand Up @@ -68,45 +68,68 @@ export class helper {
consoleLevel = process.env.LOG_LEVEL_CONSOLE;
}

const logConfig = {
appenders: {
app: {
type: 'dateFile',
filename: appLog,
maxLogSize: 8 * 1024 * 1024,
daysToKeep: 7
let logConfig: any = {};
if (!yn(process.env.FORK)) {
logConfig = {
appenders: {
app: {
type: 'dateFile',
filename: appLog,
maxLogSize: 8 * 1024 * 1024,
daysToKeep: 7
},
db: {
type: 'dateFile',
filename: dbLog,
maxLogSize: 8 * 1024 * 1024,
daysToKeep: 7
},
console: {
type: 'dateFile',
filename: consoleLog,
maxLogSize: 8 * 1024 * 1024,
daysToKeep: 7
},
consoleFilter: {
type: 'logLevelFilter',
appender: 'console',
level: consoleLevel
}
},
db: {
type: 'dateFile',
filename: dbLog,
maxLogSize: 8 * 1024 * 1024,
daysToKeep: 7
},
console: {
type: 'dateFile',
filename: consoleLog,
maxLogSize: 8 * 1024 * 1024,
daysToKeep: 7
},
consoleFilter: {
type: 'logLevelFilter',
appender: 'console',
level: consoleLevel
categories: {
default: { appenders: ['consoleFilter', 'app'], level: appLevel },
PgService: { appenders: ['consoleFilter', 'db'], level: dbLevel }
}
},
categories: {
default: { appenders: ['consoleFilter', 'app'], level: appLevel },
PgService: { appenders: ['consoleFilter', 'db'], level: dbLevel }
}
};
};

if (process.env.LOG_CONSOLE_STDOUT) {
if (yn(process.env.LOG_CONSOLE_STDOUT)) {
logConfig.appenders.console = {
...logConfig.appenders.console,
type: 'console'
if (moduleName === 'main') {
// Should initiate logger once with tcp-server appender
logConfig.appenders = {
...logConfig.appenders,
server: { type: 'tcp-server' }
};
}

if (process.env.LOG_CONSOLE_STDOUT) {
if (yn(process.env.LOG_CONSOLE_STDOUT)) {
logConfig.appenders.console = {
...logConfig.appenders.console,
type: 'console'
};
}
}
} else {
logConfig = {
appenders: {
network: {
type: 'tcp'
}
},
categories: {
default: { appenders: ['network'], level: appLevel },
PgService: { appenders: ['network'], level: dbLevel }
}
};
}

log4js.configure(logConfig);
Expand Down
8 changes: 7 additions & 1 deletion app/sync/listener/ForkListenerHandler.ts
Expand Up @@ -31,7 +31,13 @@ export class ForkListenerHandler {
* @memberof ForkListenerHandler
*/
async initialize(args) {
this.syncProcessor = fork(path.resolve(__dirname, '../../sync.js'), args);
this.syncProcessor = fork(path.resolve(__dirname, '../../sync.js'), args, {
env: {
...process.env,
// Mark forked process explicitly for logging using TCP server
FORK: '1'
}
});

this.syncProcessor.on('message', msg => {
this.platform.getProxy().processSyncMessage(msg);
Expand Down