Skip to content

Commit

Permalink
Merge e10d612 into b99e43e
Browse files Browse the repository at this point in the history
  • Loading branch information
tych0 committed Apr 29, 2024
2 parents b99e43e + e10d612 commit 6a65369
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Qtile x.xx.x, released XXXX-XX-XX:
!!! breaking changes !!!
- this release drops support for python 3.9
- deleted the (very old) libqtile/command_* deprecation wrappers
- SIGUSR2 no longer restarts qtile, instead it dumps stack traces
* features
- automatically lift types to their annotated type when specified via
the `qtile cmd-obj` command line
Expand Down
5 changes: 1 addition & 4 deletions libqtile/core/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,7 @@ async def async_loop(self) -> None:
self.core.setup_listener()

faulthandler.enable(all_threads=True)
# This is a bit unfortunate. We use SIGUSR1&2 for reloading config &
# restarting qtile, so we overload SIGWINCH here to dump threads.
faulthandler.register(signal.SIGWINCH, all_threads=True)
faulthandler.register(signal.SIGUSR2, all_threads=True)

try:
async with LoopContext(
Expand All @@ -227,7 +225,6 @@ async def async_loop(self) -> None:
signal.SIGINT: self.stop,
signal.SIGHUP: self.stop,
signal.SIGUSR1: self.reload_config,
signal.SIGUSR2: self.restart,
}
), ipc.Server(
self._prepare_socket_path(self.socket_path),
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def terminate(self):
if self.proc.is_alive():
# uh oh, we're hung somewhere. give it another second to print
# some stack traces
os.kill(self.proc.pid, signal.SIGWINCH)
os.kill(self.proc.pid, signal.SIGUSR2)
self.proc.join(1)
print("Killing qtile forcefully", file=sys.stderr)
# desperate times... this probably messes with multiprocessing...
Expand Down

0 comments on commit 6a65369

Please sign in to comment.