backendless 7.0.0 → 7.0.2

package/es/logging/index.js

@@ -11,17 +11,25 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _logger = _interopRequireDefault(require("./logger"));
+var GLOBAL_LOGGER_NAME = 'Global logger';
 var Logging = /*#__PURE__*/function () {
   function Logging(app) {
     (0, _classCallCheck2["default"])(this, Logging);
     this.app = app;
     this.reset();
-    this.setConfig(app.loggingConfig);
+    if (app.loggingConfig) {
+      this.setConfig(app.loggingConfig);
+    }
   }
   (0, _createClass2["default"])(Logging, [{
     key: "setConfig",
     value: function setConfig(config) {
-      this.config = config;
+      if (config.levels) {
+        this.levels = config.levels;
+      }
+      if (config.defaultLevel) {
+        this.defaultLevel = config.defaultLevel;
+      }
       if (config.loadLevels) {
         this.loadLoggingLevels();
       }
@@ -29,6 +37,8 @@ var Logging = /*#__PURE__*/function () {
   }, {
     key: "reset",
     value: function reset() {
+      this.levels = {};
+      this.defaultLevel = 'all';
       this.loggers = {};
       this.messages = [];
       this.numOfMessages = 10;
@@ -43,8 +53,9 @@ var Logging = /*#__PURE__*/function () {
         url: this.app.urls.loggingLevels()
       }).then(function (loggers) {
         loggers.forEach(function (logger) {
-          _this.config.levels[logger.name] = logger.level;
+          _this.levels[logger.name] = logger.level;
         });
+        _this.defaultLevel = _this.levels[GLOBAL_LOGGER_NAME] || _this.defaultLevel;
       })["catch"](function (error) {
         // eslint-disable-next-line no-console
         console.error('Could not load logging levels: ', error);

package/es/logging/logger.js

@@ -63,11 +63,7 @@ var Logger = /*#__PURE__*/function () {
   }, {
     key: "min",
     value: function min(level) {
-      var configuredLevel = this.logging.config.levels[this.name];
-      if (!configuredLevel) {
-        var defaultLevel = this.logging.config.defaultLevel;
-        return LogLevelPriorities[defaultLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
-      }
+      var configuredLevel = this.logging.levels[this.name] || this.logging.defaultLevel;
       return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
     }
   }]);

package/lib/logging/index.js

@@ -11,17 +11,25 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _logger = _interopRequireDefault(require("./logger"));
+var GLOBAL_LOGGER_NAME = 'Global logger';
 var Logging = /*#__PURE__*/function () {
   function Logging(app) {
     (0, _classCallCheck2["default"])(this, Logging);
     this.app = app;
     this.reset();
-    this.setConfig(app.loggingConfig);
+    if (app.loggingConfig) {
+      this.setConfig(app.loggingConfig);
+    }
   }
   (0, _createClass2["default"])(Logging, [{
     key: "setConfig",
     value: function setConfig(config) {
-      this.config = config;
+      if (config.levels) {
+        this.levels = config.levels;
+      }
+      if (config.defaultLevel) {
+        this.defaultLevel = config.defaultLevel;
+      }
       if (config.loadLevels) {
         this.loadLoggingLevels();
       }
@@ -29,6 +37,8 @@ var Logging = /*#__PURE__*/function () {
   }, {
     key: "reset",
     value: function reset() {
+      this.levels = {};
+      this.defaultLevel = 'all';
       this.loggers = {};
       this.messages = [];
       this.numOfMessages = 10;
@@ -43,8 +53,9 @@ var Logging = /*#__PURE__*/function () {
         url: this.app.urls.loggingLevels()
       }).then(function (loggers) {
         loggers.forEach(function (logger) {
-          _this.config.levels[logger.name] = logger.level;
+          _this.levels[logger.name] = logger.level;
         });
+        _this.defaultLevel = _this.levels[GLOBAL_LOGGER_NAME] || _this.defaultLevel;
       })["catch"](function (error) {
         // eslint-disable-next-line no-console
         console.error('Could not load logging levels: ', error);

package/lib/logging/logger.js

@@ -63,11 +63,7 @@ var Logger = /*#__PURE__*/function () {
   }, {
     key: "min",
     value: function min(level) {
-      var configuredLevel = this.logging.config.levels[this.name];
-      if (!configuredLevel) {
-        var defaultLevel = this.logging.config.defaultLevel;
-        return LogLevelPriorities[defaultLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
-      }
+      var configuredLevel = this.logging.levels[this.name] || this.logging.defaultLevel;
       return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
     }
   }]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backendless",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Backendless JavaScript SDK for Node.js and the browser",
   "browser": "dist/backendless.js",
   "main": "lib/index.js",

package/src/logging/index.js

@@ -1,5 +1,7 @@
 import Logger from './logger'
 
+const GLOBAL_LOGGER_NAME = 'Global logger'
+
 export default class Logging {
 
   constructor(app) {
@@ -7,11 +9,19 @@ export default class Logging {
 
     this.reset()
 
-    this.setConfig(app.loggingConfig)
+    if (app.loggingConfig) {
+      this.setConfig(app.loggingConfig)
+    }
   }
 
   setConfig(config) {
-    this.config = config
+    if (config.levels) {
+      this.levels = config.levels
+    }
+
+    if (config.defaultLevel) {
+      this.defaultLevel = config.defaultLevel
+    }
 
     if (config.loadLevels) {
       this.loadLoggingLevels()
@@ -19,6 +29,8 @@ export default class Logging {
   }
 
   reset() {
+    this.levels = {}
+    this.defaultLevel = 'all'
     this.loggers = {}
     this.messages = []
     this.numOfMessages = 10
@@ -31,8 +43,10 @@ export default class Logging {
       .get({ url: this.app.urls.loggingLevels() })
       .then(loggers => {
         loggers.forEach(logger => {
-          this.config.levels[logger.name] = logger.level
+          this.levels[logger.name] = logger.level
         })
+
+        this.defaultLevel = this.levels[GLOBAL_LOGGER_NAME] || this.defaultLevel
       })
       .catch(error => {
         // eslint-disable-next-line no-console

package/src/logging/logger.js

@@ -47,13 +47,7 @@ export default class Logger {
   }
 
   min(level) {
-    const configuredLevel = this.logging.config.levels[this.name]
-
-    if (!configuredLevel) {
-      const { defaultLevel } = this.logging.config
-
-      return LogLevelPriorities[defaultLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()]
-    }
+    const configuredLevel = this.logging.levels[this.name] || this.logging.defaultLevel
 
     return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()]
   }