diff --git a/unifi_protect_backup/downloader.py b/unifi_protect_backup/downloader.py index 81c98a7..2fe0ba8 100644 --- a/unifi_protect_backup/downloader.py +++ b/unifi_protect_backup/downloader.py @@ -107,10 +107,9 @@ class VideoDownloader: await self.upload_queue.put((event, video)) self.logger.debug("Added to upload queue") self.current_event = None - + except Exception as e: - self.logger.warn(f"Unexpected exception occurred, abandoning event {event.id}:") - self.logger.exception(e) + self.logger.warn(f"Unexpected exception occurred, abandoning event {event.id}:", exc_info=e) async def _download(self, event: Event) -> bytes: """Downloads the video clip for the given event""" @@ -121,8 +120,7 @@ class VideoDownloader: assert isinstance(video, bytes) break except (AssertionError, ClientPayloadError, TimeoutError) as e: - self.logger.warn(f" Failed download attempt {x+1}, retying in 1s") - self.logger.exception(e) + self.logger.warn(f" Failed download attempt {x+1}, retying in 1s", exc_info=e) await asyncio.sleep(1) else: self.logger.warn(f"Download failed after 5 attempts, abandoning event {event.id}:") diff --git a/unifi_protect_backup/event_listener.py b/unifi_protect_backup/event_listener.py index 03bce20..73d7120 100644 --- a/unifi_protect_backup/event_listener.py +++ b/unifi_protect_backup/event_listener.py @@ -111,8 +111,7 @@ class EventListener: else: logger.warn("Unable to establish connection to Unifi Protect") except Exception as e: - logger.warn("Unexpected exception occurred while trying to reconnect:") - logger.exception(e) + logger.warn("Unexpected exception occurred while trying to reconnect:", exc_info=e) # Back off for a little while await asyncio.sleep(10) diff --git a/unifi_protect_backup/missing_event_checker.py b/unifi_protect_backup/missing_event_checker.py index 26abda2..07a47c9 100644 --- a/unifi_protect_backup/missing_event_checker.py +++ b/unifi_protect_backup/missing_event_checker.py @@ -112,7 +112,6 @@ class MissingEventChecker: await self._download_queue.put(event) except Exception as e: - logger.warn(f"Unexpected exception occurred during missing event check:") - logger.exception(e) + logger.warn(f"Unexpected exception occurred during missing event check:", exc_info=e) await asyncio.sleep(self.interval) diff --git a/unifi_protect_backup/purge.py b/unifi_protect_backup/purge.py index 221cf97..85a0efc 100644 --- a/unifi_protect_backup/purge.py +++ b/unifi_protect_backup/purge.py @@ -69,8 +69,7 @@ class Purge: await tidy_empty_dirs(self.rclone_destination) except Exception as e: - logger.warn(f"Unexpected exception occurred during purge:") - logger.exception(e) + logger.warn(f"Unexpected exception occurred during purge:", exc_info=e) next_purge_time = datetime.now() + self.interval logger.extra_debug(f'sleeping until {next_purge_time}') diff --git a/unifi_protect_backup/uploader.py b/unifi_protect_backup/uploader.py index 4c697f8..26a7e36 100644 --- a/unifi_protect_backup/uploader.py +++ b/unifi_protect_backup/uploader.py @@ -65,10 +65,9 @@ class VideoUploader: self.logger.debug(f"Uploaded") self.current_event = None - + except Exception as e: - self.logger.warn(f"Unexpected exception occurred, abandoning event {event.id}:") - self.logger.exception(e) + self.logger.warn(f"Unexpected exception occurred, abandoning event {event.id}:", exc_info=e) async def _upload_video(self, video: bytes, destination: pathlib.Path, rclone_args: str): """Upload video using rclone.