jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed streameyectl

Browse Source
This commit is contained in:
Calin Crisan 2015-10-24 13:42:07 +03:00
parent 8ed901f96f
commit 696d944b2c
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
board/raspberrypi/motioneye-modules/streameyectl.py
View File

@ -407,7 +407,7 @@ def _set_streameye_settings(camera_id, s):
main_config = config.get_main() main_config = config.get_main()
username = main_config['@normal_username'] username = main_config['@normal_username']
password = main_config['@normal_password'] password = main_config['@normal_password']
realm = 'motionEye' realm = 'motionEyeOS'
logging.debug('writing streameye settings to %s' % STREAMEYE_CONF) logging.debug('writing streameye settings to %s' % STREAMEYE_CONF)
@ -452,10 +452,16 @@ def _set_streameye_settings(camera_id, s):
# make streameye-related log files downloadable # make streameye-related log files downloadable
if _get_streameye_enabled(): if _get_streameye_enabled():
def _add_log_handlers():
import handlers import handlers
handlers.LogHandler.LOGS['streameye'] = (os.path.join(settings.LOG_PATH, 'streameye.log'), 'streameye.log') 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.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 @additional_config
def streamEyeLog(): def streamEyeLog():
return { return {

6
board/raspberrypi2/motioneye-modules/streameyectl.py
View File

@ -452,10 +452,16 @@ def _set_streameye_settings(camera_id, s):
# make streameye-related log files downloadable # make streameye-related log files downloadable
if _get_streameye_enabled(): if _get_streameye_enabled():
def _add_log_handlers():
import handlers import handlers
handlers.LogHandler.LOGS['streameye'] = (os.path.join(settings.LOG_PATH, 'streameye.log'), 'streameye.log') 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.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 @additional_config
def streamEyeLog(): def streamEyeLog():
return { return {