motion log level follows now as much as possible motionEye's log level

diff --git a/motioneye/config.py b/motioneye/config.py
index de42747ac9ec01c57fd55ed52e78dc93ed7c5f6b..edc9afc824dbaa147eb4c0cdd356c74c03e2881e 100644 (file)
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -1668,6 +1668,8 @@ def _set_default_motion(data, old_motion):
     data.setdefault('@admin_password', '')
     data.setdefault('@normal_username', 'user')
     data.setdefault('@normal_password', '')
+    
+    data.setdefault('setup_mode', False)
 
     if old_motion:
         data.setdefault('control_port', settings.MOTION_CONTROL_PORT)

diff --git a/motioneye/motionctl.py b/motioneye/motionctl.py
index f3c6c7c2903bc0e19910209af4de026931a082e4..8e5ae3ae9e764b05513e5813b165623a031f6a0b 100644 (file)
--- a/motioneye/motionctl.py
+++ b/motioneye/motionctl.py
@@ -104,12 +104,18 @@ def start(deferred=False):
             '-c', motion_config_path]
     
     args.append('-d')
-    if settings.LOG_LEVEL == logging.DEBUG:
+    if settings.LOG_LEVEL <= logging.DEBUG:
         args.append('9')
     
-    else:
+    elif settings.LOG_LEVEL <= logging.WARN:
         args.append('5')
 
+    elif settings.LOG_LEVEL <= logging.ERROR:
+        args.append('4')
+    
+    else: # fatat, quiet
+        args.append('1')
+
     log_file = open(motion_log_path, 'w')
     
     process = subprocess.Popen(args, stdout=log_file, stderr=log_file, close_fds=True, cwd=settings.CONF_PATH)