From 96af6394f3f9ed3bc8df9c7cf87a0667de24d069 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 12 Dec 2015 19:59:29 +0200 Subject: [PATCH] motion log level follows now as much as possible motionEye's log level --- motioneye/config.py | 2 ++ motioneye/motionctl.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/motioneye/config.py b/motioneye/config.py index de42747..edc9afc 100644 --- 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 f3c6c7c..8e5ae3a 100644 --- 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) -- 2.39.5