Merge pull request #5 from jitsi/disable-caller-info

Disable caller info
jitsi · Aug 23, 2019 · a885cc9 · a885cc9
2 parents 5da3033 + 7234f55
commit a885cc9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/lib/LogCollector.js b/lib/LogCollector.js
@@ -1,4 +1,4 @@
-/* Copyright @ 2016 Atlassian Pty Ltd
+/* Copyright @ 2016-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/lib/Logger.js b/lib/Logger.js
@@ -1,4 +1,4 @@
-/* Copyright @ 2015 Atlassian Pty Ltd
+/* Copyright @ 2015-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,19 @@ Logger.removeGlobalTransport = function(transport) {
     }
 };
 
+/**
+ * The global configuration options.
+ */
+var globalOptions = {};
+
+/**
+ * Sets global options which will be used by all loggers. Changing these works
+ * even after other loggers are created.
+ */
+Logger.setGlobalOptions = function(options) {
+    globalOptions = options || {};
+}
+
 /**
  * Parses Error's object stack trace and extracts information about the last
  * caller before the log method was called.
@@ -115,7 +128,9 @@ function log() {
         return;
     }
 
-    var callerInfo = !logger.options.disableCallerInfo && getCallerInfo();
+    var callerInfo
+        = !(logger.options.disableCallerInfo
+            || globalOptions.disableCallerInfo) && getCallerInfo();
     var transports = globalTransports.concat(logger.transports);
     for(var i = 0; i < transports.length; i++) {
         var t = transports[i];
@@ -127,7 +142,7 @@ function log() {
                 logPrefixes.push("[" + logger.id + "]");
             }
 
-            if (callerInfo) {
+            if (callerInfo && callerInfo.methodName.length > 1) {
                 logPrefixes.push("<" + callerInfo.methodName + ">: ");
             }
 

diff --git a/lib/index.js b/lib/index.js
@@ -1,4 +1,4 @@
-/* Copyright @ 2015 Atlassian Pty Ltd
+/* Copyright @ 2015-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,6 +67,13 @@ module.exports = {
     removeGlobalTransport: function(transport) {
         Logger.removeGlobalTransport(transport);
     },
+    /**
+    * Sets global options which will be used by all loggers. Changing these
+    * works even after other loggers are created.
+    */
+    setGlobalOptions: function(options) {
+        Logger.setGlobalOptions(options);
+    },
     /**
      * Creates new logger.
      * @arguments the same as Logger constructor