rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid logging in signal handlers.

Browse Source 
If we don't do that, we can get this:

--- Logging error ---
Traceback (most recent call last):
  File ".../python3.5/logging/__init__.py", line 984, in emit
    self.flush()
  File ".../python3.5/logging/__init__.py", line 964, in flush
    self.stream.flush()
RuntimeError: reentrant call inside <_io.BufferedWriter name='<stderr>'>
Call stack:
  [...]
  File ".../qutebrowser/app.py", line 122, in qt_mainloop
    return qApp.exec_()
  File ".../qutebrowser/utils/objreg.py", line 118, in on_destroyed
    log.destroy.debug("schedule removal: {}".format(name))
  File ".../python3.5/logging/__init__.py", line 1267, in debug
    self._log(DEBUG, msg, args, **kwargs)
  File ".../python3.5/logging/__init__.py", line 1415, in _log
    self.handle(record)
  File ".../python3.5/logging/__init__.py", line 1425, in handle
    self.callHandlers(record)
  File ".../python3.5/logging/__init__.py", line 1487, in callHandlers
    hdlr.handle(record)
  File ".../python3.5/logging/__init__.py", line 855, in handle
    self.emit(record)
  File ".../python3.5/logging/__init__.py", line 984, in emit
    self.flush()
  File ".../python3.5/logging/__init__.py", line 964, in flush
    self.stream.flush()
  File ".../qutebrowser/misc/crashsignal.py", line 365, in interrupt
    log.destroy.info("Do the same again to forcefully quit.")
Message: 'Do the same again to forcefully quit.'
Arguments: ()
This commit is contained in:
Florian Bruhin 2015-11-18 20:21:23 +01:00
parent 4d1f37f296
commit c7f386cec0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qutebrowser/misc/crashsignal.py
View File

@ -355,17 +355,23 @@ class SignalHandler(QObject):
log.destroy.exception("Failed to read wakeup fd.") log.destroy.exception("Failed to read wakeup fd.")
self._notifier.setEnabled(True) self._notifier.setEnabled(True)
def _log_later(self, *lines):
"""Log the given text line-wise with a QTimer."""
for line in lines:
QTimer.singleShot(0, functools.partial(log.destroy.info, line))
def interrupt(self, signum, _frame): def interrupt(self, signum, _frame):
"""Handler for signals to gracefully shutdown (SIGINT/SIGTERM). """Handler for signals to gracefully shutdown (SIGINT/SIGTERM).
This calls shutdown and remaps the signal to call This calls shutdown and remaps the signal to call
interrupt_forcefully the next time. interrupt_forcefully the next time.
""" """
log.destroy.info("SIGINT/SIGTERM received, shutting down!")
log.destroy.info("Do the same again to forcefully quit.")
signal.signal(signal.SIGINT, self.interrupt_forcefully) signal.signal(signal.SIGINT, self.interrupt_forcefully)
signal.signal(signal.SIGTERM, self.interrupt_forcefully) signal.signal(signal.SIGTERM, self.interrupt_forcefully)
# If we call shutdown directly here, we get a segfault. # Signals can arrive anywhere, so we do this in the main thread
self._log_later(
"SIGINT/SIGTERM received, shutting down!",
"Do the same again to forcefully quit.")
QTimer.singleShot(0, functools.partial( QTimer.singleShot(0, functools.partial(
self._quitter.shutdown, 128 + signum)) self._quitter.shutdown, 128 + signum))
@ -376,12 +382,12 @@ class SignalHandler(QObject):
It then remaps the signals to call self.interrupt_really_forcefully the It then remaps the signals to call self.interrupt_really_forcefully the
next time. next time.
""" """
log.destroy.info("Forceful quit requested, goodbye cruel world!")
log.destroy.info("Do the same again to quit with even more force.")
signal.signal(signal.SIGINT, self.interrupt_really_forcefully) signal.signal(signal.SIGINT, self.interrupt_really_forcefully)
signal.signal(signal.SIGTERM, self.interrupt_really_forcefully) signal.signal(signal.SIGTERM, self.interrupt_really_forcefully)
# This *should* work without a QTimer, but because of the trouble in # Signals can arrive anywhere, so we do this in the main thread
# self.interrupt we're better safe than sorry. self._log_later(
"Forceful quit requested, goodbye cruel world!",
"Do the same again to quit with even more force.")
QTimer.singleShot(0, functools.partial(self._app.exit, 128 + signum)) QTimer.singleShot(0, functools.partial(self._app.exit, 128 + signum))
def interrupt_really_forcefully(self, signum, _frame): def interrupt_really_forcefully(self, signum, _frame):
@ -390,5 +396,5 @@ class SignalHandler(QObject):
This doesn't run *any* Qt cleanup and simply exits via Python. This doesn't run *any* Qt cleanup and simply exits via Python.
It will most likely lead to a segfault. It will most likely lead to a segfault.
""" """
log.destroy.info("WHY ARE YOU DOING THIS TO ME? :(") print("WHY ARE YOU DOING THIS TO ME? :(")
sys.exit(128 + signum) sys.exit(128 + signum)