From 696d944b2c765a9c908d444bc6bfba79a48de632 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 24 Oct 2015 13:42:07 +0300 Subject: [PATCH] fixed streameyectl --- .../raspberrypi/motioneye-modules/streameyectl.py | 14 ++++++++++---- .../raspberrypi2/motioneye-modules/streameyectl.py | 12 +++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/board/raspberrypi/motioneye-modules/streameyectl.py b/board/raspberrypi/motioneye-modules/streameyectl.py index f03b380138..8f6dc4bfa9 100644 --- a/board/raspberrypi/motioneye-modules/streameyectl.py +++ b/board/raspberrypi/motioneye-modules/streameyectl.py @@ -407,7 +407,7 @@ def _set_streameye_settings(camera_id, s): main_config = config.get_main() username = main_config['@normal_username'] password = main_config['@normal_password'] - realm = 'motionEye' + realm = 'motionEyeOS' logging.debug('writing streameye settings to %s' % STREAMEYE_CONF) @@ -452,9 +452,15 @@ def _set_streameye_settings(camera_id, s): # make streameye-related log files downloadable if _get_streameye_enabled(): - import handlers - handlers.LogHandler.LOGS['streameye'] = (os.path.join(settings.LOG_PATH, 'streameye.log'), 'streameye.log') - handlers.LogHandler.LOGS['raspimjpeg'] = (os.path.join(settings.LOG_PATH, 'raspimjpeg.log'), 'raspimjpeg.log') + def _add_log_handlers(): + import handlers + handlers.LogHandler.LOGS['streameye'] = (os.path.join(settings.LOG_PATH, 'streameye.log'), 'streameye.log') + handlers.LogHandler.LOGS['raspimjpeg'] = (os.path.join(settings.LOG_PATH, 'raspimjpeg.log'), 'raspimjpeg.log') + + # handlers.LogHandler is not yet available + # at the time streameyectl is imported + io_loop = IOLoop.instance() + io_loop.add_callback(_add_log_handlers) @additional_config def streamEyeLog(): diff --git a/board/raspberrypi2/motioneye-modules/streameyectl.py b/board/raspberrypi2/motioneye-modules/streameyectl.py index 1fb01afb0c..8f6dc4bfa9 100644 --- a/board/raspberrypi2/motioneye-modules/streameyectl.py +++ b/board/raspberrypi2/motioneye-modules/streameyectl.py @@ -452,9 +452,15 @@ def _set_streameye_settings(camera_id, s): # make streameye-related log files downloadable if _get_streameye_enabled(): - import handlers - handlers.LogHandler.LOGS['streameye'] = (os.path.join(settings.LOG_PATH, 'streameye.log'), 'streameye.log') - handlers.LogHandler.LOGS['raspimjpeg'] = (os.path.join(settings.LOG_PATH, 'raspimjpeg.log'), 'raspimjpeg.log') + def _add_log_handlers(): + import handlers + handlers.LogHandler.LOGS['streameye'] = (os.path.join(settings.LOG_PATH, 'streameye.log'), 'streameye.log') + handlers.LogHandler.LOGS['raspimjpeg'] = (os.path.join(settings.LOG_PATH, 'raspimjpeg.log'), 'raspimjpeg.log') + + # handlers.LogHandler is not yet available + # at the time streameyectl is imported + io_loop = IOLoop.instance() + io_loop.add_callback(_add_log_handlers) @additional_config def streamEyeLog():