From dfcdd07a844afb9d516764cf9a639192a38f47d2 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Tue, 22 Aug 2023 15:56:01 +0200 Subject: [PATCH] Timezone fix in the scheduler. (0.25.5) --- bin/linspector | 2 +- linspector/linspector.py | 9 ++++----- linspector/monitor.py | 9 ++++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/bin/linspector b/bin/linspector index 7cb2a8e..9681e89 100755 --- a/bin/linspector +++ b/bin/linspector @@ -20,7 +20,7 @@ from linspector.environment import Environment from linspector.linspector import Linspector from linspector.monitors import Monitors -__version__ = '0.25.4' +__version__ = '0.25.5' __author__ = 'Johannes Findeisen ' diff --git a/linspector/linspector.py b/linspector/linspector.py index b6b78f3..1c93e1b 100644 --- a/linspector/linspector.py +++ b/linspector/linspector.py @@ -7,6 +7,7 @@ See LICENSE. import datetime import importlib import random +import time from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor from apscheduler.jobstores.memory import MemoryJobStore @@ -76,13 +77,10 @@ class Linspector: 'max_instances': 1 } - if configuration.get_option('linspector', 'timezone'): - timezone = configuration.get_option('linspector', 'timezone') - self._scheduler['linspector'] = BackgroundScheduler(jobstores=jobstores, executors=executors, job_defaults=job_defaults, - timezone=timezone) + timezone=time.tzname[0]) start_date = datetime.datetime.now() log.debug(monitors.get_monitors()) @@ -111,7 +109,8 @@ class Linspector: 'timezone') else: # set to local system timezone as default - timezone = datetime.datetime.now(datetime.timezone.utc).astimezone().tzname() + #timezone = datetime.datetime.now(datetime.timezone.utc).astimezone().tzname() + timezone = time.tzname[0] # add cron and one time run jobs to Linspector. not only "interval" jobs should be # supported. diff --git a/linspector/monitor.py b/linspector/monitor.py index ec0d1c9..faf95b0 100644 --- a/linspector/monitor.py +++ b/linspector/monitor.py @@ -78,6 +78,7 @@ class Monitor: implemented): 4 """ try: + notification_list = None if configuration.get_option('linspector', 'notifications') or \ monitor_configuration.get('monitor', 'notifications'): @@ -91,10 +92,8 @@ class Monitor: notification_list = configuration.get_option('linspector', 'notifications') elif monitor_configuration.get('monitor', 'notifications'): notification_list = monitor_configuration.get('monitor', 'notifications') - else: - notification_list = None - self._notification_list = notification_list.split(',') + self._notification_list = notification_list.split(',') for notification_option in notification_list.split(','): if notification_option not in notifications: @@ -180,5 +179,5 @@ class Monitor: def set_job(self, scheduler_job): self._scheduler_job = scheduler_job - def _str_(self): - return str(self._dict_) + def __str__(self): + return str(self.__dict__)