diff --git a/changedetectionio/flask_app.py b/changedetectionio/flask_app.py index 399f568c1..0a9c006d3 100644 --- a/changedetectionio/flask_app.py +++ b/changedetectionio/flask_app.py @@ -794,15 +794,19 @@ def ticker_thread_check_time_launch_checks(): # @todo - Maybe make this a hook? # Time schedule limit - Decide between watch or global settings + scheduler_source = None if watch.get('time_between_check_use_default'): time_schedule_limit = datastore.data['settings']['requests'].get('time_schedule_limit', {}) - logger.trace(f"{uuid} Time scheduler - Using system/global settings") + scheduler_source = 'system/global settings' + else: time_schedule_limit = watch.get('time_schedule_limit') - logger.trace(f"{uuid} Time scheduler - Using watch settings (not global settings)") + scheduler_source = 'watch' + tz_name = datastore.data['settings']['application'].get('scheduler_timezone_default', os.getenv('TZ', 'UTC').strip()) if time_schedule_limit and time_schedule_limit.get('enabled'): + logger.trace(f"{uuid} Time scheduler - Using scheduler settings from {scheduler_source}") try: result = is_within_schedule(time_schedule_limit=time_schedule_limit, default_tz=tz_name @@ -814,6 +818,7 @@ def ticker_thread_check_time_launch_checks(): logger.error( f"{uuid} - Recheck scheduler, error handling timezone, check skipped - TZ name '{tz_name}' - {str(e)}") return False + # If they supplied an individual entry minutes to threshold. threshold = recheck_time_system_seconds if watch.get('time_between_check_use_default') else watch.threshold_seconds()