From 9e411d8a68af4d5b30bcf17013cea5c134e46096 Mon Sep 17 00:00:00 2001 From: dbarzin Date: Wed, 22 Feb 2023 22:01:59 +0100 Subject: [PATCH] review logs --- pandora-box.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pandora-box.py b/pandora-box.py index 10e7bea..2daff13 100755 --- a/pandora-box.py +++ b/pandora-box.py @@ -433,7 +433,7 @@ class PandoraBox: self._log("Scan done in %ds, %d files scanned, %d files infected" % ((time.time() - scan_start_time),file_count,len(self.infected_files))) logging.info( - f'duration="{int(time.time() - scan_start_time)}s", '\ + f'duration="{int(time.time() - scan_start_time)}", '\ f'files_scanned="{file_count}", '\ f'files_infected="{len(self.infected_files)}"') return "CLEAN" @@ -456,14 +456,13 @@ class PandoraBox: except Exception as ex: self._log(f"Unexpected error: {str(ex)}") logging.info(f'error="{str(ex)}"', exc_info=True) - finally: - self._log("Done.") return "STOP" def _device_inserted(self, dev): + self._log("Device inserted") + logging.info("device-inserted") self.device = dev self._log_device_info(self.device) - logging.info("device_inserted") if not self.has_curses: self.display_image("WORK") else: @@ -476,6 +475,8 @@ class PandoraBox: return "INSERTED" def _device_removed(self): + self._log("Device removed") + logging.info("device-removed") self.device = None if not self.has_curses: self.display_image("WAIT")