From c72a6b2c14202f2fa60ea5a39258f826b78151fa Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Mon, 11 Mar 2019 16:36:44 -0400 Subject: [PATCH] Clean up logging logic for DB check --- varken/helpers.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/varken/helpers.py b/varken/helpers.py index 05f6978..459b51b 100644 --- a/varken/helpers.py +++ b/varken/helpers.py @@ -69,16 +69,10 @@ class GeoIPHandler(object): self.download() self.reader_manager(action='open') else: - td = dbdate - today - if td.days < 0: - self.logger.debug("Geolite2 DB is only %s days old. Keeping current copy. Next update after %s", - abs(td.days), db_next_update) - self.logger.debug("GeoLite2 DB date %s, DB updates after: %s, Today: %s", - dbdate, db_next_update, today) - else: - self.logger.debug("Geolite2 DB will update in %s days", abs(td.days)) - self.logger.debug("GeoLite2 DB date %s, DB updates after: %s, Today: %s", - dbdate, db_next_update, today) + db_days_update = db_next_update - today + self.logger.debug("Geolite2 DB will update in %s days", abs(db_days_update.days)) + self.logger.debug("GeoLite2 DB date %s, DB updates after: %s, Today: %s", + dbdate, db_next_update, today) def download(self): tar_dbfile = abspath(join(self.data_folder, 'GeoLite2-City.tar.gz')) @@ -117,7 +111,11 @@ class GeoIPHandler(object): tar.extract(files, self.data_folder) self.logger.debug('%s has been extracted to %s', files, self.data_folder) tar.close() - remove(tar_dbfile) + try: + remove(tar_dbfile) + self.logger.debug('Removed the GeoLite2 DB TAR file.') + except FileNotFoundError: + self.logger.warn("Cannot remove GeoLite2 DB TAR file as it does not exsist!") def hashit(string):