From: Calin Crisan Date: Sat, 20 Feb 2016 16:34:53 +0000 (+0200) Subject: list media timeout when sending emails is now configurable X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=db04401a2e61bd2d4eb08be618c978c0a9d9e451;p=motioneye-debian list media timeout when sending emails is now configurable --- diff --git a/extra/motioneye.conf.sample b/extra/motioneye.conf.sample index 552f699..43a860f 100644 --- 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 6dba6f1..1398e7e 100644 --- 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 c8100cf..301b179 100644 --- 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