Skip to content
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

Don't shutdown on reload signal(SIGHUP) when using the reloader option #376

Merged
merged 3 commits into from
Aug 13, 2024
Merged

Don't shutdown on reload signal(SIGHUP) when using the reloader option #376

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1adaaca
don't shutdown on reload (SIGHUP)
hendrikmuhs Aug 6, 2024
64738f9
apply review suggestions
hendrikmuhs Aug 6, 2024
a0adbd9
Minor code refactor
gi0baro Aug 13, 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
40 changes: 25 additions & 15 deletions granian/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,14 @@ def shutdown(self, exit_code=0):
if exit_code:
sys.exit(exit_code)

def _reload(self, sock, spawn_target, target_loader):
logger.info('HUP signal received, gracefully respawning workers..')
workers = list(range(self.workers))
self.reload_signal = False
self.respawned_procs.clear()
self.main_loop_interrupt.clear()
self._respawn_workers(workers, sock, spawn_target, target_loader, delay=self.respawn_interval)

def _serve_loop(self, sock, spawn_target, target_loader):
while True:
self.main_loop_interrupt.wait()
Expand All @@ -560,12 +568,7 @@ def _serve_loop(self, sock, spawn_target, target_loader):
self._respawn_workers(workers, sock, spawn_target, target_loader)

if self.reload_signal:
logger.info('HUP signal received, gracefully respawning workers..')
workers = list(range(self.workers))
self.reload_signal = False
self.respawned_procs.clear()
self.main_loop_interrupt.clear()
self._respawn_workers(workers, sock, spawn_target, target_loader, delay=self.respawn_interval)
self._reload(sock, spawn_target, target_loader)

def _serve(self, spawn_target, target_loader):
sock = self.startup(spawn_target, target_loader)
Expand All @@ -580,15 +583,22 @@ def _serve_with_reloader(self, spawn_target, target_loader):
reload_path = Path.cwd()
sock = self.startup(spawn_target, target_loader)

try:
for changes in watchfiles.watch(reload_path, stop_event=self.main_loop_interrupt):
logger.info('Changes detected, reloading workers..')
for change, file in changes:
logger.info(f'{change.raw_str().capitalize()}: {file}')
self._stop_workers()
self._spawn_workers(sock, spawn_target, target_loader)
except StopIteration:
pass
serve_loop = True
while serve_loop:
try:
for changes in watchfiles.watch(reload_path, stop_event=self.main_loop_interrupt):
logger.info('Changes detected, reloading workers..')
for change, file in changes:
logger.info(f'{change.raw_str().capitalize()}: {file}')
self._stop_workers()
self._spawn_workers(sock, spawn_target, target_loader)
except StopIteration:
pass

if self.reload_signal:
self._reload(sock, spawn_target, target_loader)
else:
serve_loop = False

self.shutdown()

Expand Down
Loading