From 671a93685521e338bf095237544098b138a38c8d Mon Sep 17 00:00:00 2001 From: Alastair Flynn Date: Wed, 20 Mar 2024 17:22:28 -0400 Subject: [PATCH 1/2] Add .idea to the gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 76f6db4cc..f979a2fb0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ pytestdebug.log .vscode/ deb_dist *.tar.gz +.idea/ From d13bc8edaa949b66fbf16b5e0e9f03dc02810f9e Mon Sep 17 00:00:00 2001 From: Alastair Flynn Date: Wed, 20 Mar 2024 18:55:03 -0400 Subject: [PATCH 2/2] Add logger to all calls of run_with_inturrupt --- juju/controller.py | 3 ++- juju/model.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/juju/controller.py b/juju/controller.py index 97e9963f0..c3286c81f 100644 --- a/juju/controller.py +++ b/juju/controller.py @@ -854,7 +854,8 @@ async def _watcher(stop_event): try: results = await utils.run_with_interrupt( watcher.Next(), - stop_event) + stop_event, + log=log) except JujuAPIError as e: if 'watcher was stopped' not in str(e): raise diff --git a/juju/model.py b/juju/model.py index ccfd78588..1575381bb 100644 --- a/juju/model.py +++ b/juju/model.py @@ -1204,7 +1204,8 @@ async def _all_watcher(): try: results = await utils.run_with_interrupt( allwatcher.Next(), - self._watch_stopping) + self._watch_stopping, + log=log) except JujuAPIError as e: if 'watcher was stopped' not in str(e): raise