From 9c9274f0b479eb0104180cad33e68e8f0a4106ca Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Sat, 1 Oct 2022 10:25:42 +0200 Subject: [PATCH] Mostly cleanups and added comments to the config files. --- bin/linspector | 2 +- etc/linspector.conf | 3 ++ linspector/core/periods.py | 95 -------------------------------------- 3 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 linspector/core/periods.py diff --git a/bin/linspector b/bin/linspector index cdab530..e1bde86 100755 --- a/bin/linspector +++ b/bin/linspector @@ -34,7 +34,7 @@ from linspector.core.monitors import Monitors # i currently only set the 3rd number because the goal is that 0.19 will become the first stable # version. -__version__ = '0.19.16.dev1' +__version__ = '0.19.17.dev1' __author__ = 'Johannes Findeisen ' logger = logging.getLogger('linspector') diff --git a/etc/linspector.conf b/etc/linspector.conf index 786ea90..88fae57 100644 --- a/etc/linspector.conf +++ b/etc/linspector.conf @@ -83,7 +83,10 @@ email_resend = 10 ; if types can or must be configured before use; for now no use case seen. ; every type can be configured in it's own ini file in etc/types; there no type name as prefix is not needed. [services] +; run the speedtest not very often. it is not for alerting about problems bur maybe will be at some day. speedtest_interval = 3600 +; the file to get for calculation of the downlink speed. microsoft has very fast servers so it will become a meaningful +; result. speedtest_url = https://go.microsoft.com/fwlink/?Linkid=850641 ; tasks executed at the end of each monitor execution. this is for storing data for longtime analysis. not every task diff --git a/linspector/core/periods.py b/linspector/core/periods.py deleted file mode 100644 index 4ea7c3e..0000000 --- a/linspector/core/periods.py +++ /dev/null @@ -1,95 +0,0 @@ -""" -This file is part of Linspector (https://linspector.org/) -Copyright (c) 2022 Johannes Findeisen . All Rights Reserved. -See LICENSE (MIT license) -""" -from apscheduler.util import convert_to_datetime - -from linspector.core.helpers import log - - -class Period(object): - def __init__(self, name): - self.name = name - - def get_name(self): - return self.name - - -class IntervalPeriod(Period): - def __init__(self, name="", weeks=0, days=0, hours=0, minutes=0, seconds=0, start_date=None, - comment=None): - super().__init__(name) - - self.days = days # number of days to wait - self.weeks = weeks # number of weeks to wait - self.hours = hours # number of hours to wait - self.minutes = minutes # number of minutes to wait - self.seconds = seconds # number of seconds to wait - self.start_date = start_date # when to first execute - self.comment = comment # comment - - #def createJob(self, scheduler, jobInfo, func, **kwargs): - # start_date = self.start_date - # if "start_date" in kwargs: - # start_date = kwargs["start_date"] - - # return scheduler.add_job(func, trigger="interval", weeks=self.weeks, hours=self.hours, minutes=self.minutes, - # seconds=self.seconds, start_date=start_date, args=[jobInfo], timezone="CET") - - def __str__(self): - ret = "IntervalPeriod(Name: " + self.name + ")" - return ret - - -class CronPeriod(Period): - def __init__(self, name="", year="*", month="*", day="*", week="*", day_of_week="*", hour="*", minute="*", - second="0", start_date=None, comment=None): - super(CronPeriod, self).__init__(name) - self.year = year # 4-digit year number - self.month = month # month number (1-12) - self.day = day # day of the month (1-31) - self.week = week # ISO week number (1-53) - self.day_of_week = day_of_week # number or name of weekday (0-6 or mon,tue,wed,thu,fri,sat,sun) - self.hour = hour # hour (0-23) - self.minute = minute # minute (0-59) - self.second = second # second (0-59) - self.start_date = start_date - self.comment = comment - - def __str__(self): - ret = "CronPeriod(Name: " + self.name + ")" - return ret - - #def createJob(self, scheduler, jobInfo, func, **kwargs): - # start_date = self.start_date - - # if "start_date" in kwargs: - # start_date = kwargs["start_date"] - - # return scheduler.add_job(func, trigger="cron", year=self.year, month=self.month, day=self.day, week=self.week, - # day_of_week=self.day_of_week, hour=self.hour, minute=self.minute, - # second=self.second, start_date=start_date, args=[jobInfo]) - - -class DatePeriod(Period): - def __init__(self, name, date, comment=None): - super(DatePeriod, self).__init__(name) - self.date = date - self.comment = comment - - def __str__(self): - ret = "DatePeriod(Name: " + self.name + ", " + str(self.date) + ")" - return ret - - #def createJob(self, scheduler, jobInfo, func, **kwargs): - # try: - # if "start_date" in kwargs: - # earliest = kwargs["start_date"] - # date = convert_to_datetime(self.date) - # if date < earliest: - # self.date = earliest - - # return scheduler.add_job(func=func, trigger="date", date=self.date, args=[jobInfo]) - # except Exception, e: - # logger.error("exception while creating job out of DatePeriod!\n%s" % e)