Skip to content

Avoid installing signal handlers to the event loop #1014

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
Jan 29, 2024
Merged

Avoid installing signal handlers to the event loop #1014

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
aef8c57
Avoid adding signal handlers to the event loop at connection
cderici Jan 25, 2024
c6af97a
Fix typo in the makefile
cderici Jan 25, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ run-unit-tests: lint .tox
tox -e py3

.PHONY: run-integration-tests
run-unit-tests: lint .tox
run-integration-tests: lint .tox
tox -e integration

.PHONY: run-all-tests
Expand Down
10 changes: 0 additions & 10 deletions juju/client/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import json
import logging
import ssl
import signal
import urllib.request
import weakref
from http.client import HTTPSConnection
Expand Down Expand Up @@ -425,10 +424,6 @@ def _exit_tasks():
for task in jasyncio.all_tasks():
task.cancel()

loop = jasyncio.get_running_loop()
for sig in (signal.SIGINT, signal.SIGTERM):
loop.add_signal_handler(sig, _exit_tasks)

return (await websockets.connect(
url,
ssl=self._get_ssl(cacert),
Expand Down Expand Up @@ -473,11 +468,6 @@ async def close(self, to_reconnect=False):
if self.proxy is not None:
self.proxy.close()

# Remove signal handlers
loop = jasyncio.get_running_loop()
for sig in (signal.SIGINT, signal.SIGTERM):
loop.remove_signal_handler(sig)

async def _recv(self, request_id):
if not self.is_open:
raise websockets.exceptions.ConnectionClosed(0, 'websocket closed')
Expand Down