list media timeout when sending emails is now configurable

diff --git a/extra/motioneye.conf.sample b/extra/motioneye.conf.sample
index 552f6998d97479dc25b82feff9c3fd53a7e641e5..43a860fca267bd21676f6c38c50b84cc653b0bc0 100644 (file)
--- a/extra/motioneye.conf.sample
+++ b/extra/motioneye.conf.sample
@@ -80,6 +80,9 @@ smtp_timeout 60
 # timeout in seconds to wait for media files list
 list_media_timeout 120
 
+# timeout in seconds to wait for media files list, when sending emails
+list_media_timeout_email 10
+
 # timeout in seconds to wait for zip file creation
 zip_timeout 500
 

diff --git a/motioneye/sendmail.py b/motioneye/sendmail.py
index 6dba6f19490fdbe53763109d057c5b9386e2410f..1398e7e914c4942819ab90d16b1945d469dfff7b 100644 (file)
--- a/motioneye/sendmail.py
+++ b/motioneye/sendmail.py
@@ -172,7 +172,7 @@ def main(parser, args):
     
     # do not wait too long for media list,
     # email notifications are critical
-    settings.LIST_MEDIA_TIMEOUT = 10
+    settings.LIST_MEDIA_TIMEOUT = settings.LIST_MEDIA_TIMEOUT_EMAIL
     
     camera_id = motionctl.thread_id_to_camera_id(options.thread_id)
 

diff --git a/motioneye/settings.py b/motioneye/settings.py
index c8100cf1ce20814bca5c77df90b59b3cb708cbd2..301b1791c6784bc0bb932915960a919932a80a10 100644 (file)
--- a/motioneye/settings.py
+++ b/motioneye/settings.py
@@ -110,6 +110,9 @@ SMTP_TIMEOUT = 60
 # timeout in seconds to wait for media files list
 LIST_MEDIA_TIMEOUT = 120
 
+# timeout in seconds to wait for media files list, when sending emails
+LIST_MEDIA_TIMEOUT_EMAIL = 10
+
 # timeout in seconds to wait for zip file creation
 ZIP_TIMEOUT = 500