backendless 7.1.0 → 7.2.0

package/es/index.js

@@ -163,7 +163,7 @@ var Backendless = /*#__PURE__*/function () {
       app.__removeService('LocalCache');
       var loggingConfig = (0, _extends2["default"])({
         loadLevels: true,
-        defaultLevel: 'all',
+        globalLevel: 'all',
         levels: {}
       }, config.logging);
       if (app.__hasService('Logging')) {

package/es/logging/index.js

@@ -27,8 +27,8 @@ var Logging = /*#__PURE__*/function () {
       if (config.levels) {
         this.levels = config.levels;
       }
-      if (config.defaultLevel) {
-        this.defaultLevel = config.defaultLevel;
+      if (config.globalLevel) {
+        this.globalLevel = config.globalLevel;
       }
       if (config.loadLevels) {
         this.loadLoggingLevels();
@@ -38,7 +38,7 @@ var Logging = /*#__PURE__*/function () {
     key: "reset",
     value: function reset() {
       this.levels = {};
-      this.defaultLevel = 'all';
+      this.globalLevel = 'all';
       this.loggers = {};
       this.messages = [];
       this.numOfMessages = 10;
@@ -51,11 +51,16 @@ var Logging = /*#__PURE__*/function () {
       var _this = this;
       this.app.request.get({
         url: this.app.urls.loggingLevels()
-      }).then(function (loggers) {
-        loggers.forEach(function (logger) {
-          _this.levels[logger.name] = logger.level;
+      }).then(function (loggersList) {
+        var loggers = {};
+        loggersList.forEach(function (logger) {
+          loggers[logger.name] = logger.level;
+        });
+        var globalLevel = loggers[GLOBAL_LOGGER_NAME];
+        _this.setConfig({
+          loggers: loggers,
+          globalLevel: globalLevel
         });
-        _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,8 +63,16 @@ var Logger = /*#__PURE__*/function () {
   }, {
     key: "min",
     value: function min(level) {
-      var configuredLevel = this.logging.levels[this.name] || this.logging.defaultLevel;
-      return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
+      level = level.toLowerCase();
+      var globalLevel = this.logging.globalLevel;
+      var loggerLevel = this.logging.levels[this.name];
+      if (globalLevel && LogLevelPriorities[globalLevel.toLowerCase()] < LogLevelPriorities[level]) {
+        return false;
+      }
+      if (!loggerLevel) {
+        return true;
+      }
+      return LogLevelPriorities[loggerLevel.toLowerCase()] >= LogLevelPriorities[level];
     }
   }]);
   return Logger;

package/lib/index.js

@@ -163,7 +163,7 @@ var Backendless = /*#__PURE__*/function () {
       app.__removeService('LocalCache');
       var loggingConfig = (0, _extends2["default"])({
         loadLevels: true,
-        defaultLevel: 'all',
+        globalLevel: 'all',
         levels: {}
       }, config.logging);
       if (app.__hasService('Logging')) {

package/lib/logging/index.js

@@ -27,8 +27,8 @@ var Logging = /*#__PURE__*/function () {
       if (config.levels) {
         this.levels = config.levels;
       }
-      if (config.defaultLevel) {
-        this.defaultLevel = config.defaultLevel;
+      if (config.globalLevel) {
+        this.globalLevel = config.globalLevel;
       }
       if (config.loadLevels) {
         this.loadLoggingLevels();
@@ -38,7 +38,7 @@ var Logging = /*#__PURE__*/function () {
     key: "reset",
     value: function reset() {
       this.levels = {};
-      this.defaultLevel = 'all';
+      this.globalLevel = 'all';
       this.loggers = {};
       this.messages = [];
       this.numOfMessages = 10;
@@ -51,11 +51,16 @@ var Logging = /*#__PURE__*/function () {
       var _this = this;
       this.app.request.get({
         url: this.app.urls.loggingLevels()
-      }).then(function (loggers) {
-        loggers.forEach(function (logger) {
-          _this.levels[logger.name] = logger.level;
+      }).then(function (loggersList) {
+        var loggers = {};
+        loggersList.forEach(function (logger) {
+          loggers[logger.name] = logger.level;
+        });
+        var globalLevel = loggers[GLOBAL_LOGGER_NAME];
+        _this.setConfig({
+          loggers: loggers,
+          globalLevel: globalLevel
         });
-        _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,8 +63,16 @@ var Logger = /*#__PURE__*/function () {
   }, {
     key: "min",
     value: function min(level) {
-      var configuredLevel = this.logging.levels[this.name] || this.logging.defaultLevel;
-      return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
+      level = level.toLowerCase();
+      var globalLevel = this.logging.globalLevel;
+      var loggerLevel = this.logging.levels[this.name];
+      if (globalLevel && LogLevelPriorities[globalLevel.toLowerCase()] < LogLevelPriorities[level]) {
+        return false;
+      }
+      if (!loggerLevel) {
+        return true;
+      }
+      return LogLevelPriorities[loggerLevel.toLowerCase()] >= LogLevelPriorities[level];
     }
   }]);
   return Logger;

package/package.json

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

package/src/index.js

@@ -146,7 +146,7 @@ class Backendless {
 
     app.__removeService('LocalCache')
 
-    const loggingConfig = Object.assign({ loadLevels: true, defaultLevel: 'all', levels: {} }, config.logging)
+    const loggingConfig = Object.assign({ loadLevels: true, globalLevel: 'all', levels: {} }, config.logging)
 
     if (app.__hasService('Logging')) {
       app.Logging.reset()

package/src/logging/index.js

@@ -19,8 +19,8 @@ export default class Logging {
       this.levels = config.levels
     }
 
-    if (config.defaultLevel) {
-      this.defaultLevel = config.defaultLevel
+    if (config.globalLevel) {
+      this.globalLevel = config.globalLevel
     }
 
     if (config.loadLevels) {
@@ -30,7 +30,7 @@ export default class Logging {
 
   reset() {
     this.levels = {}
-    this.defaultLevel = 'all'
+    this.globalLevel = 'all'
     this.loggers = {}
     this.messages = []
     this.numOfMessages = 10
@@ -41,12 +41,16 @@ export default class Logging {
   loadLoggingLevels() {
     this.app.request
       .get({ url: this.app.urls.loggingLevels() })
-      .then(loggers => {
-        loggers.forEach(logger => {
-          this.levels[logger.name] = logger.level
+      .then(loggersList => {
+        const loggers = {}
+
+        loggersList.forEach(logger => {
+          loggers[logger.name] = logger.level
         })
 
-        this.defaultLevel = this.levels[GLOBAL_LOGGER_NAME] || this.defaultLevel
+        const globalLevel = loggers[GLOBAL_LOGGER_NAME]
+
+        this.setConfig({ loggers, globalLevel })
       })
       .catch(error => {
         // eslint-disable-next-line no-console

package/src/logging/logger.js

@@ -47,8 +47,19 @@ export default class Logger {
   }
 
   min(level) {
-    const configuredLevel = this.logging.levels[this.name] || this.logging.defaultLevel
+    level = level.toLowerCase()
 
-    return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()]
+    const globalLevel = this.logging.globalLevel
+    const loggerLevel = this.logging.levels[this.name]
+
+    if (globalLevel && LogLevelPriorities[globalLevel.toLowerCase()] < LogLevelPriorities[level]) {
+      return false
+    }
+
+    if (!loggerLevel) {
+      return true
+    }
+
+    return LogLevelPriorities[loggerLevel.toLowerCase()] >= LogLevelPriorities[level]
   }
 }