Merge pull request #1036 from Aflynn50/bugfix-NoneType-master

#1036 #### Description Merge up #1035
juju · Mar 25, 2024 · 7aa83cb · 7aa83cb
2 parents 959d7f0 + d13bc8e
commit 7aa83cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ pytestdebug.log
 .vscode/
 deb_dist
 *.tar.gz
+.idea/
diff --git 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
@@ -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