Use config for logLevel.

bcgov · Feb 11, 2020 · 796e183 · 796e183
1 parent 6144253
commit 796e183
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/frontend/config/default.json.example b/frontend/config/default.json.example
@@ -1,6 +1,8 @@
 {
   "port": 8000,
   "wsPort": 3001,
+  "logLevel": "info",
+  "morganLogLevel": "dev",
   "cookieSecret": "COOKIE_SECRET_HERE",
   "jwtSecret": "JWT_SECRET_HERE",
   "helpURL": "EXTERNAL DOCUMENTATION URL (optional)",

diff --git a/frontend/config/test.json.example b/frontend/config/test.json.example
@@ -1,6 +1,8 @@
 {
   "port": 8000,
   "wsPort": 3001,
+  "logLevel": "error",
+  "morganLogLevel": "dev",
   "cookieSecret": "COOKIE_SECRET_HERE",
   "jwtSecret": "JWT_SECRET_HERE",
   "helpURL": "EXTERNAL DOCUMENTATION URL (optional)",

diff --git a/frontend/entrypoint.sh b/frontend/entrypoint.sh
@@ -5,6 +5,8 @@ printf "{\n" > ./config/default.json
 printf "\"port\": \"${PORT}\",\n" >> ./config/default.json
 printf "\"host\": \"${HOST}\",\n" >> ./config/default.json
 printf "\"helpURL\": \"${HELP_URL}\",\n" >> ./config/default.json
+printf "\"logLevel\": \"${LOG_LEVEL}\",\n" >> ./config/default.json
+printf "\"morganLogType\": \"dev\",\n" >> ./config/default.json
 printf "\"forumApiHost\": \"${FORUM_API_HOST}\",\n" >> ./config/default.json
 printf "\"forumSocket\": \"${FORUM_SOCKET_HOST}\",\n" >> ./config/default.json
 printf "\"requestApiHost\": \"${REQUEST_API_HOST}\",\n" >> ./config/default.json

diff --git a/frontend/helm/ocwa-frontend/templates/deployment.yaml b/frontend/helm/ocwa-frontend/templates/deployment.yaml
@@ -28,6 +28,8 @@ spec:
               value: "{{ .Values.port }}"
             - name: HOST
               value: {{ .Values.host }}
+            - name: LOG_LEVEL
+              value: {{ .Values.logLevel }}
             - name: HELP_URL
               value: "{{ .Values.helpURL }}"
             - name: FORUM_API_HOST

diff --git a/frontend/server/app.js b/frontend/server/app.js
@@ -39,8 +39,10 @@ const requestSocket = config.get('requestSocket');
 const exporterMode = config.get('exporterMode');
 const codeExportEnabled = config.get('codeExportEnabled');
 const repositoryHost = config.get('repositoryHost');
+const logLevel = config.get('logLevel');
+const morganLogLevel = config.get('morganLogLevel');
 
-log.level = 'debug'; // config.get('logLevel');
+log.level = logLevel;
 log.addLevel('debug', 2900, { fg: 'green' });
 
 const memoryStore = new MemoryStore({
@@ -54,7 +56,7 @@ if (process.env.NODE_ENV !== 'test') {
     }),
   });
   app.use(logger);
-  app.use(morgan('dev'));
+  app.use(morgan(morganLogLevel));
 }
 
 if (isDevelopment) {
@@ -71,9 +73,6 @@ if (isDevelopment) {
   app.use(webpackHotMiddleware(compiler));
 }
 
-log.level = 'debug'; // config.get('logLevel');
-log.addLevel('debug', 2900, { fg: 'green' });
-
 // Express config
 app.set('view engine', 'pug');
 app.set('views', `${__dirname}/views`);

diff --git a/terraform/ocwa_frontend.tf b/terraform/ocwa_frontend.tf
@@ -23,6 +23,7 @@ resource "docker_container" "ocwa_download_frontend" {
   env = [
     "COOKIE_SECRET=${random_string.cookie.result}",
     "JWT_SECRET=${random_string.jwtSecret.result}",
+    "LOG_LEVEL=debug",
     "AUTH_ENDPOINT=${var.authHost}/auth/realms/ocwa/protocol/openid-connect/auth",
     "TOKEN_ENDPOINT=${var.authHost}/auth/realms/ocwa/protocol/openid-connect/token",
     "USER_INFO_ENDPOINT=${var.authHost}/auth/realms/ocwa/protocol/openid-connect/userinfo",