fixed streameyectl

motioneye-project · Oct 24, 2015 · 696d944 · 696d944
1 parent 8ed901f
commit 696d944
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git 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
@@ -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():