diff --git a/database.py b/database.py index 9cbd330..391d65f 100644 --- a/database.py +++ b/database.py @@ -26,7 +26,6 @@ Level = int class Path(): - # FP add boolean here pass diff --git a/eulaurarien.sh b/eulaurarien.sh index 068d678..9adbac5 100755 --- a/eulaurarien.sh +++ b/eulaurarien.sh @@ -10,4 +10,5 @@ ./resolve_subdomains.sh ./import_rapid7.sh ./prune.sh +./export_lists.sh diff --git a/feed_dns.py b/feed_dns.py index 20eeb69..8dea41d 100755 --- a/feed_dns.py +++ b/feed_dns.py @@ -58,6 +58,10 @@ class Writer(multiprocessing.Process): # IndexError: IP too big self.log.exception("Cannot execute: %s", record) + def end(self) -> None: + self.db.enter_step('end') + self.db.save() + def run(self) -> None: self.open_db() if self.autosave_interval > 0: @@ -80,9 +84,7 @@ class Writer(multiprocessing.Process): next_save = time.time() + self.autosave_interval self.db.enter_step('block_wait') - - self.db.enter_step('end') - self.db.save() + self.end() class Parser(): @@ -240,6 +242,7 @@ if __name__ == '__main__': ) parser = parser_cls(args.input, writer=writer) parser.run() + writer.end() else: recs_queue: multiprocessing.Queue = multiprocessing.Queue( maxsize=args.queue_size)