From: Calin Crisan Date: Wed, 24 Sep 2014 14:38:15 +0000 (+0300) Subject: added LOG_PATH setting X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=647faca7b08cad5495742c39441a8064c3f1bb5c;p=motioneye-debian added LOG_PATH setting --- diff --git a/motioneye.py b/motioneye.py index fcf61a8..3fed3df 100755 --- a/motioneye.py +++ b/motioneye.py @@ -43,6 +43,7 @@ def _configure_settings(): set_default_setting('STATIC_URL', '/static/') set_default_setting('CONF_PATH', os.path.join(settings.PROJECT_PATH, 'conf')) set_default_setting('RUN_PATH', os.path.join(settings.PROJECT_PATH, 'run')) + set_default_setting('LOG_PATH', os.path.join(settings.PROJECT_PATH, 'log')) set_default_setting('MEDIA_PATH', os.path.join(settings.PROJECT_PATH, 'media')) set_default_setting('REPO', ('ccrisan', 'motioneye')) set_default_setting('LOG_LEVEL', logging.INFO) @@ -128,6 +129,12 @@ def _configure_settings(): except: pass + try: + os.makedirs(settings.LOG_PATH) + + except: + pass + try: os.makedirs(settings.MEDIA_PATH) diff --git a/settings_default.py b/settings_default.py index c2d34fd..294420f 100644 --- a/settings_default.py +++ b/settings_default.py @@ -14,9 +14,12 @@ STATIC_URL = '/static/' # path to the config directory; must be writable CONF_PATH = os.path.abspath(os.path.join(PROJECT_PATH, 'conf')) -# log and pid files go here +# pid files go here RUN_PATH = os.path.abspath(os.path.join(PROJECT_PATH, 'run')) +# log files go here +LOG_PATH = os.path.abspath(os.path.join(PROJECT_PATH, 'log')) + # default output path for media files MEDIA_PATH = os.path.abspath(os.path.join(PROJECT_PATH, 'media')) diff --git a/src/motionctl.py b/src/motionctl.py index c738ce5..e3e6734 100644 --- a/src/motionctl.py +++ b/src/motionctl.py @@ -86,7 +86,7 @@ def start(): program, version = program # @UnusedVariable motion_config_path = os.path.join(settings.CONF_PATH, 'motion.conf') - motion_log_path = os.path.join(settings.RUN_PATH, 'motion.log') + motion_log_path = os.path.join(settings.LOG_PATH, 'motion.log') motion_pid_path = os.path.join(settings.RUN_PATH, 'motion.pid') args = [program,