made clientLog structure easier to edit via script

Jacoblab1 · Aug 22, 2018 · 6da18cd · 6da18cd
1 parent 6459b84
commit 6da18cd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/bigbluebutton-html5/imports/startup/client/logger.js b/bigbluebutton-html5/imports/startup/client/logger.js
@@ -16,7 +16,7 @@ import { nameFromLevel } from '@browser-bunyan/levels';
 // externalURL is the end-point that logs will be sent to
 // Call the logger by doing a function call with the level name, I.e, logger.warn('Hi on warn')
 
-const LOG_CONFIG = Meteor.settings.public.clientLog || [{ target: 'console', level: 'info' }];
+const LOG_CONFIG = Meteor.settings.public.clientLog || { console: { enabled: true, level: 'info' } };
 const { fullInfo } = Auth;
 
 // Custom stream that logs to an end-point
@@ -66,10 +66,15 @@ function createStreamForTarget(target, options) {
 }
 
 function generateLoggerStreams(config) {
-  return config.map(({ target, level, ...streamOptions }) => ({
-    level,
-    stream: createStreamForTarget(target, streamOptions),
-  }));
+  let result = [];
+  Object.keys(config).forEach((key) => {
+    const logOption = config[key];
+    if (logOption && logOption.enabled) {
+      const { level, ...streamOptions } = logOption;
+      result = result.concat({ level, stream: createStreamForTarget(key, streamOptions) });
+    }
+  });
+  return result;
 }
 
 // Creates the logger with the array of streams of the chosen targets

diff --git a/bigbluebutton-html5/private/config/settings-development.json b/bigbluebutton-html5/private/config/settings-development.json
@@ -343,12 +343,11 @@
         ]
       }
     },
-    "clientLog": [
-      { 
-        "target": "server", 
-        "level": "info" 
-      }
-    ]
+    "clientLog": {
+      "server": { "enabled": true, "level": "info" },
+      "console": { "enabled": false, "level": "debug" },
+      "external": { "enabled": false, "level": "info", "url": "https://LOG_HOST/html5Log", "method": "POST" }
+    }
   },
 
   "private": {

diff --git a/bigbluebutton-html5/private/config/settings-production.json b/bigbluebutton-html5/private/config/settings-production.json
@@ -343,12 +343,11 @@
         ]
       }
     },
-    "clientLog": [
-      { 
-        "target": "server", 
-        "level": "info" 
-      }
-    ]
+    "clientLog": {
+      "server": { "enabled": true, "level": "info" },
+      "console": { "enabled": false, "level": "debug" },
+      "external": { "enabled": false, "level": "info", "url": "https://LOG_HOST/html5Log", "method": "POST" }
+    }
   },
 
   "private": {