d_mcknight/Varken
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up logging logic for DB check

Browse source
This commit is contained in:
samwiseg0 2019-03-11 16:36:44 -04:00
parent 52e852b930
commit c72a6b2c14
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
varken/helpers.py
View file

@ -69,16 +69,10 @@ class GeoIPHandler(object):
self.download() self.download()
self.reader_manager(action='open') self.reader_manager(action='open')
else: else:
td = dbdate - today db_days_update = db_next_update - today
if td.days < 0: self.logger.debug("Geolite2 DB will update in %s days", abs(db_days_update.days))
self.logger.debug("Geolite2 DB is only %s days old. Keeping current copy. Next update after %s", self.logger.debug("GeoLite2 DB date %s, DB updates after: %s, Today: %s",
abs(td.days), db_next_update) dbdate, db_next_update, today)
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)
def download(self): def download(self):
tar_dbfile = abspath(join(self.data_folder, 'GeoLite2-City.tar.gz')) tar_dbfile = abspath(join(self.data_folder, 'GeoLite2-City.tar.gz'))
@ -117,7 +111,11 @@ class GeoIPHandler(object):
tar.extract(files, self.data_folder) tar.extract(files, self.data_folder)
self.logger.debug('%s has been extracted to %s', files, self.data_folder) self.logger.debug('%s has been extracted to %s', files, self.data_folder)
tar.close() 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): def hashit(string):