BE-880 Fix incorrect multi-process logging (#260)

* BE-880 Fix incorrect multi-process logging Signed-off-by: Atsushi Neki <nekiaiken@gmail.com> * BE-880 Add some comments for implementaion Signed-off-by: Atsushi Neki <nekiaiken@gmail.com>
hyperledger-labs · Aug 10, 2021 · 1448548 · 1448548
1 parent 79ec06f
commit 1448548
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 61 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -398,7 +398,9 @@
 					"sqlcharacter",
 					"peerlist",
 					"www",
-					"craetedat"
+					"craetedat",
+					"tcp",
+					"appender"
 				],
 				"skipWordIfMatch": [
 					"^\\d+px",

diff --git a/app/common/commonUtils.ts b/app/common/commonUtils.ts
diff --git a/app/common/helper.ts b/app/common/helper.ts
@@ -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);

diff --git a/app/sync/listener/ForkListenerHandler.ts b/app/sync/listener/ForkListenerHandler.ts
@@ -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);