Merge pull request #88 from crypticgeek/nukecutoff

fix nuke_cutoff not being respected
klloe-global_config
Scott Hand 8 years ago committed by GitHub
commit 27b50f6f2f

@ -151,14 +151,14 @@ class Shredder(object):
self._logger.debug("Deleting due to blacklist") self._logger.debug("Deleting due to blacklist")
count_removed += 1 count_removed += 1
self._remove(item) self._remove(item)
elif self._check_whitelist(item): elif created <= self._nuke_cutoff:
self._logger.debug("Skipping due to: whitelisted")
continue
if created <= self._nuke_cutoff:
self._logger.debug("Item occurs prior to nuke cutoff") self._logger.debug("Item occurs prior to nuke cutoff")
count_removed += 1 count_removed += 1
self._remove(item) self._remove(item)
elif created > self._recent_cutoff: elif self._check_whitelist(item):
self._logger.debug("Skipping due to: whitelisted")
continue
elif created > self._recent_cutoff:
self._logger.debug("Skipping due to: too recent") self._logger.debug("Skipping due to: too recent")
continue continue
else: else:

Loading…
Cancel
Save