logging code cleanup

Author: svpcom

wfb_ng/__init__.py

@@ -89,8 +89,8 @@ def color_str(arg, c, bold=False):
 
 class ConsoleObserver(object):
     def emit(self, eventDict):
-        print('[%s] %s' % (eventDict['system'], eventDict['log_text']))
-        sys.stdout.flush()
+        txt = '\n        '.join(str(eventDict['log_text']).rstrip().split('\n'))
+        print('[%s] %s' % (eventDict['system'], txt), flush=True)
 
 
 def __find_caller(depth):
@@ -142,14 +142,24 @@ class LogLevel(object):
                   LogLevel.ALERT : 'alert',
                   LogLevel.FATAL : 'fatal_error'}
 
+min_level = LogLevel.DEBUG
+
+
+def set_log_level(level):
+    global min_level
+    min_level = level
+
 
 def _log_msg(*args, **kwargs):
     level = kwargs.get('level', None)
 
-    if level not in set(LogLevel.__dict__.values()):
+    if level not in log_level_map:
         level = LogLevel.ERROR if kwargs.get('isError') else LogLevel.INFO
         kwargs['level'] = level
 
+    if level < min_level:
+        return
+
     error = (level >= LogLevel.ERROR)
     kwargs['isError'] = 1 if error else 0
     module, func = __find_caller(2)

wfb_ng/server.py

@@ -31,7 +31,7 @@
 from twisted.python import log, failure
 from twisted.internet import reactor, defer
 
-from . import _log_msg, ConsoleObserver, ErrorSafeLogFile, call_and_check_rc, ExecError, version_msg
+from . import _log_msg, ConsoleObserver, ErrorSafeLogFile, call_and_check_rc, ExecError, version_msg, LogLevel, set_log_level
 from .common import abort_on_crash, exit_status, df_sleep, search_attr
 from .protocols import AntStatsAndSelector, RFTempMeter, SSHClientProtocol, MsgPackAPIFactory, JSONAPIFactory, notify_ready
 from .services import parse_services, init_udp_direct_tx, init_udp_direct_rx, init_mavlink, init_tunnel, init_udp_proxy, hash_link_domain, bandwidth_map
@@ -304,6 +304,7 @@ def main():
         print(gen_bind_yaml(args.profiles))
         return
 
+    set_log_level(LogLevel.DEBUG if settings.common.debug else LogLevel.INFO)
     log.msg = _log_msg
 
     if settings.common.log_file: