From 1bd9cfa7cdef4d766e96824430a0f3c7ffa7e720 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 16 Nov 2013 21:29:57 +0200 Subject: [PATCH] added a separate setting for the thumbnailer interval --- motioneye.py | 4 ++-- settings_default.py | 3 +++ src/mjpgclient.py | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/motioneye.py b/motioneye.py index 09e11c6..ab54ab5 100755 --- a/motioneye.py +++ b/motioneye.py @@ -215,9 +215,9 @@ def _start_movie_thumbnailer(): logging.error('failed to make movie thumbnail: %(msg)s' % { 'msg': unicode(e)}) - ioloop.add_timeout(datetime.timedelta(seconds=settings.MJPG_CLIENT_TIMEOUT), do_next_movie_thumbail) + ioloop.add_timeout(datetime.timedelta(seconds=settings.THUMBNAILER_INTERVAL), do_next_movie_thumbail) - ioloop.add_timeout(datetime.timedelta(seconds=settings.MJPG_CLIENT_TIMEOUT), do_next_movie_thumbail) + ioloop.add_timeout(datetime.timedelta(seconds=settings.THUMBNAILER_INTERVAL), do_next_movie_thumbail) if __name__ == '__main__': diff --git a/settings_default.py b/settings_default.py index 46898be..399720b 100644 --- a/settings_default.py +++ b/settings_default.py @@ -35,6 +35,9 @@ MOTION_CHECK_INTERVAL = 10 # interval in seconds at which the janitor is called to remove old pictures and movies CLEANUP_INTERVAL = 43200 +# interval in seconds at which the thumbnail mechanism runs +THUMBNAILER_INTERVAL = 60 + # timeout in seconds to wait for responses when contacting a remote server REMOTE_REQUEST_TIMEOUT = 10 diff --git a/src/mjpgclient.py b/src/mjpgclient.py index b5b6491..2dea7f9 100644 --- a/src/mjpgclient.py +++ b/src/mjpgclient.py @@ -164,6 +164,6 @@ def close_all(): client.close() -# run the garbage collector for the first time; -# this will start the timeout mechanism -_garbage_collector() \ No newline at end of file +# schedule the garbage collector +io_loop = ioloop.IOLoop.instance() +io_loop.add_timeout(datetime.timedelta(seconds=settings.MJPG_CLIENT_TIMEOUT), _garbage_collector) -- 2.39.5