minor meyectl.py and thumbnailer.py changes

diff --git a/motioneye/meyectl.py b/motioneye/meyectl.py
index 33157baf99d32bb974aa28f37164312f38951a9a..9bb465b2877fdc8707c5ff0cf48275766a228fce 100755 (executable)
--- a/motioneye/meyectl.py
+++ b/motioneye/meyectl.py
@@ -191,7 +191,7 @@ def make_arg_parser(command=None):
         usage = description = epilog = None
         
     else:
-        usage = '%(prog)s [command] [-c CONFIG_FILE] [-d] [-v] [command options...]\n\n'
+        usage = '%(prog)s [command] [-c CONFIG_FILE] [-d] [-h] [-l] [-v] [command options...]\n\n'
         
         description = 'available commands:\n'
         description += '  startserver\n'

diff --git a/motioneye/thumbnailer.py b/motioneye/thumbnailer.py
index c70286386708aebf3fc3cfe01143e46ae2895941..e100f0f3cbd3af6608912d9f77270402add9d7aa 100644 (file)
--- a/motioneye/thumbnailer.py
+++ b/motioneye/thumbnailer.py
@@ -31,9 +31,12 @@ _process = None
 
 
 def start():
+    if not settings.THUMBNAILER_INTERVAL:
+        return
+
     # schedule the first call a bit later to improve performance at startup
     ioloop = tornado.ioloop.IOLoop.instance()
-    ioloop.add_timeout(datetime.timedelta(seconds=30), _run_process)
+    ioloop.add_timeout(datetime.timedelta(seconds=min(settings.THUMBNAILER_INTERVAL, 30)), _run_process)
 
 
 def stop():