- do not send logs if global is OFF

Author: Valodya

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()

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

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]
   }
 }

test/unit/specs/logging.js

@@ -557,8 +557,8 @@ describe('<Logging>', function() {
       appId  : APP_ID,
       apiKey : API_KEY,
       logging: {
-        defaultLevel: 'info',
-        levels      : {
+        globalLevel: 'info',
+        levels     : {
           [loggerName]: 'warn'
         }
       }
@@ -591,6 +591,44 @@ describe('<Logging>', function() {
     ])
   })
 
+  it('should ignore all logs when global is OFF', async () => {
+    prepareMockRequest([
+      {
+        name : loggerName,
+        level: 'INFO'
+      },
+      {
+        name : 'Global logger',
+        level: 'OFF'
+      }
+    ])
+
+    Backendless.initApp({
+      appId  : APP_ID,
+      apiKey : API_KEY,
+      logging: {
+        globalLevel: 'info',
+        levels     : {
+          [loggerName]: 'warn'
+        }
+      }
+    })
+
+    await Utils.wait(1000)
+
+    logger.debug('debug message')
+    logger.info('info message')
+    logger.fatal('fatal message')
+    logger.trace('trace message')
+
+    const unregisteredLogger = Backendless.Logging.getLogger('unregistered')
+
+    unregisteredLogger.info('should not be flushed')
+    unregisteredLogger.error('should be flushed')
+
+    await Backendless.Logging.flush() // it won't send any request
+  })
+
   it('should not load log levels', async () => {
     Backendless.initApp({
       appId  : APP_ID,