Skip to content

Commit

Permalink
return True indicating that the event is handled
Browse files Browse the repository at this point in the history
  • Loading branch information
mmerickel committed Feb 18, 2020
1 parent 16c3b58 commit e670bda
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
19 changes: 11 additions & 8 deletions src/hupper/reloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,17 @@ def _capture_signals(self):
try:
for signame, control in self._signals.items():
signum = getattr(signal, signame, None)
if signum is not None:
handler = self._control_proxy(control)
if WIN and signame == 'SIGINT':
undo = winapi.AddConsoleCtrlHandler(handler)
undo_handlers.append(undo)
handler = signal.SIG_IGN
psig = signal.signal(signum, handler)
undo_handlers.append(lambda: signal.signal(signum, psig))
if signum is None:
continue
handler = self._control_proxy(control)
if WIN and signame == 'SIGINT':
undo = winapi.AddConsoleCtrlHandler(handler)
undo_handlers.append(undo)
handler = signal.SIG_IGN
psig = signal.signal(signum, handler)
undo_handlers.append(
lambda s=signum, p=psig: signal.signal(s, p)
)
yield
finally:
for undo in reversed(undo_handlers):
Expand Down
4 changes: 3 additions & 1 deletion src/hupper/winapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def SetConsoleCtrlHandler(handler, add):
SetConsoleCtrlHandler.argtypes = (PHANDLER_ROUTINE, BOOL)
SetConsoleCtrlHandler.restype = BOOL

ret = SetConsoleCtrlHandler(handler, True)
ret = SetConsoleCtrlHandler(handler, add)
CheckError(ret, 'failed in to set console ctrl handler')


Expand All @@ -204,6 +204,8 @@ def console_handler(ctrl_type):
CTRL_SHUTDOWN_EVENT,
):
handler()
return True
return False

SetConsoleCtrlHandler(console_handler, True)
return lambda: SetConsoleCtrlHandler(console_handler, False)

0 comments on commit e670bda

Please sign in to comment.