From 93b048bc10c83da57a077c79ee6e2c35eed3a7dc Mon Sep 17 00:00:00 2001
From: Jerko Steiner <jerko.steiner@gmail.com>
Date: Sat, 23 Mar 2019 20:50:10 +0800
Subject: [PATCH] Add correlationId to SqlLogger

---
 packages/client/src/team/TeamManager.tsx     |  2 --
 packages/server/src/application/Bootstrap.ts |  3 +-
 packages/server/src/database/index.test.ts   |  2 +-
 packages/server/src/logger/SqlLogger.ts      | 34 +++++++++++++++-----
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/team/TeamManager.tsx b/packages/client/src/team/TeamManager.tsx
index acb09e6..a717d1f 100644
--- a/packages/client/src/team/TeamManager.tsx
+++ b/packages/client/src/team/TeamManager.tsx
@@ -42,8 +42,6 @@ export class TeamManager extends React.PureComponent<ITeamManagerProps> {
     const editTeamId = this.props.match.params.teamId !== undefined ?
       Number(this.props.match.params.teamId) : undefined
 
-    console.log('props', this.props)
-
     return (
       <React.Fragment>
         <TeamList
diff --git a/packages/server/src/application/Bootstrap.ts b/packages/server/src/application/Bootstrap.ts
index cdf2e81..a1fe715 100644
--- a/packages/server/src/application/Bootstrap.ts
+++ b/packages/server/src/application/Bootstrap.ts
@@ -26,7 +26,8 @@ export class Bootstrap implements IBootstrap {
   }
 
   protected createDatabase(): IDatabase {
-    const sqlLogger = new SqlLogger(loggerFactory.getLogger('sql'))
+    const sqlLogger = new SqlLogger(
+      loggerFactory.getLogger('sql'), this.namespace)
     return new Database(this.namespace, sqlLogger, this.config.app.db)
   }
 
diff --git a/packages/server/src/database/index.test.ts b/packages/server/src/database/index.test.ts
index 3c056a5..65cd360 100644
--- a/packages/server/src/database/index.test.ts
+++ b/packages/server/src/database/index.test.ts
@@ -9,7 +9,7 @@ import {SqlLogger, loggerFactory} from '../logger'
 const ns = createNamespace('clsify-test')
 const database = new Database(
   ns,
-  new SqlLogger(loggerFactory.getLogger('sql')),
+  new SqlLogger(loggerFactory.getLogger('sql'), ns),
   config.app.db,
 )
 
diff --git a/packages/server/src/logger/SqlLogger.ts b/packages/server/src/logger/SqlLogger.ts
index 114f01f..0f47565 100644
--- a/packages/server/src/logger/SqlLogger.ts
+++ b/packages/server/src/logger/SqlLogger.ts
@@ -1,14 +1,20 @@
 import {ILogger} from './ILogger'
 import {Logger, QueryRunner} from 'typeorm'
+import {Namespace} from 'cls-hooked'
+import {CORRELATION_ID} from '../middleware/Transaction'
 
 export class SqlLogger implements Logger {
-  constructor(protected readonly logger: ILogger) {}
+  constructor(
+    protected readonly logger: ILogger,
+    protected readonly ns: Namespace,
+  ) {}
 
   logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner): any {
+    const correlationId = this.getCorrelationId()
     if (parameters) {
-      this.logger.info('%s -- %s', query, parameters)
+      this.logger.info('%s %s -- %s', correlationId, query, parameters)
     } else {
-      this.logger.info(query)
+      this.logger.info('%s %s', correlationId, query)
     }
   }
   /**
@@ -20,10 +26,12 @@ export class SqlLogger implements Logger {
     parameters?: any[],
     queryRunner?: QueryRunner,
   ) {
+    const correlationId = this.getCorrelationId()
     if (parameters) {
-      this.logger.error('%s :: %s -- %s', error, query, parameters)
+      this.logger.error('%s %s :: %s -- %s',
+        correlationId, error, query, parameters)
     } else {
-      this.logger.error('%s :: %s', error, query)
+      this.logger.error('%s %s :: %s', correlationId, error, query)
     }
   }
   /**
@@ -34,10 +42,13 @@ export class SqlLogger implements Logger {
     parameters?: any[],
     queryRunner?: QueryRunner,
   ) {
+    const correlationId = this.getCorrelationId()
     if (parameters) {
-      this.logger.warn('Slow query: %d :: %s -- %s', time, query, parameters)
+      this.logger.warn('%s Slow query: %d :: %s -- %s',
+        correlationId, time, query, parameters)
     } else {
-      this.logger.warn('Slow query: %d :: %s', time, query)
+      this.logger.warn('%s Slow query: %d :: %s',
+        correlationId, time, query)
     }
   }
   /**
@@ -61,9 +72,16 @@ export class SqlLogger implements Logger {
     message: any,
     queryRunner?: QueryRunner,
   ) {
+    const correlationId = this.getCorrelationId()
     if (level === 'log') {
       level = 'info'
     }
-    this.logger[level]('%o', message)
+    this.logger[level]('%s %o', correlationId, message)
   }
+
+  protected getCorrelationId(): string | undefined {
+    const correlationId: string = this.ns.get(CORRELATION_ID)
+    return correlationId || ''
+  }
+
 }