Skip to content

Bugfix none type on master #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jujubot merged 2 commits into from
Mar 25, 2024
Merged

Bugfix none type on master #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
671a936
Add .idea to the gitignore
Aflynn50 Mar 20, 2024
d13bc8e
Add logger to all calls of run_with_inturrupt
Aflynn50 Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ pytestdebug.log
.vscode/
deb_dist
*.tar.gz
.idea/
3 changes: 2 additions & 1 deletion juju/controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion juju/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down