diff --git a/varken/helpers.py b/varken/helpers.py index beae9af..648eb5a 100644 --- a/varken/helpers.py +++ b/varken/helpers.py @@ -33,7 +33,7 @@ class GeoIPHandler(object): def update(self): today = date.today() - dbdate = None + try: dbdate = date.fromtimestamp(stat(self.dbfile).st_ctime) except FileNotFoundError: @@ -55,7 +55,6 @@ class GeoIPHandler(object): else: self.logger.debug('Geolite2 DB will update in %s days', abs(td.days)) - def download(self): tar_dbfile = abspath(join(self.data_folder, 'GeoLite2-City.tar.gz')) url = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz' diff --git a/varken/iniparser.py b/varken/iniparser.py index beb4d3f..badbdc4 100644 --- a/varken/iniparser.py +++ b/varken/iniparser.py @@ -66,7 +66,7 @@ class INIParser(object): search = (r'(?:([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}|' # domain... r'localhost|' # localhost... - r'^[a-zA-Z0-9_-]*|' # hostname only. My soul dies a little every time this is used... + r'^[a-zA-Z0-9_-]*|' # hostname only. My soul dies a little every time this is used... r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip ) # Include search for port if it is needed. @@ -80,7 +80,8 @@ class INIParser(object): valid = match(regex, url_check) is not None if not valid: if inc_port: - self.logger.error('%s is invalid in module [%s]! URL must host/IP and port if not 80 or 443. ie. localhost:8080', + self.logger.error('%s is invalid in module [%s]! URL must host/IP and ' + 'port if not 80 or 443. ie. localhost:8080', url_check, module) exit(1) else: @@ -185,7 +186,7 @@ class INIParser(object): server = OmbiServer(server_id, scheme + url, apikey, verify_ssl, request_type_counts, request_type_run_seconds, request_total_counts, - request_total_run_seconds, issue_status_counts, + request_total_run_seconds, issue_status_counts, issue_status_run_seconds) if service == 'sickchill': diff --git a/varken/ombi.py b/varken/ombi.py index 7299273..86f8e33 100644 --- a/varken/ombi.py +++ b/varken/ombi.py @@ -189,4 +189,4 @@ class OmbiAPI(object): } ] - self.dbmanager.write_points(influx_payload) \ No newline at end of file + self.dbmanager.write_points(influx_payload) diff --git a/varken/structures.py b/varken/structures.py index 4916fee..694b8cc 100644 --- a/varken/structures.py +++ b/varken/structures.py @@ -108,6 +108,7 @@ class OmbiRequestCounts(NamedTuple): approved: int = 0 available: int = 0 + class OmbiIssuesCounts(NamedTuple): pending: int = 0 inProgress: int = 0