e8f87acc6c
Do not backport string changes since we are after string freeze phase - Don't stop when the plugin directory is empty - Fix missing margins on Troubleshoot window - Resize all solutions panels horizontally - Fix missing priority color for proposed solutions - Set translation domain for Gtk.Builder() object to have strings correctly translated - Make labels on GtkButtons translatable - Handla all exceptions from do_analyze_logfile() - Fix semi-translated messages - Do not catch POSIX signals (rhbz#1366004, rhbz#1419245)
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From af2aa6c0491cb719d4be2ce60bc79c0541d18a44 Mon Sep 17 00:00:00 2001
|
|
From: Petr Lautrbach <plautrba@redhat.com>
|
|
Date: Thu, 14 Sep 2017 07:53:10 +0200
|
|
Subject: [PATCH 15/19] framework: Don not catch POSIX signals
|
|
|
|
Let it kill your process in the normal way
|
|
|
|
See https://bugzilla.redhat.com/show_bug.cgi?id=1366004#c35
|
|
|
|
Fixes:
|
|
Traceback (most recent call last):
|
|
File "/usr/lib64/python3.6/site-packages/dbus/service.py", line 647, in _message_cb
|
|
if not isinstance(message, MethodCallMessage):
|
|
SystemError: <built-in function isinstance> returned a result with an error set
|
|
Traceback (most recent call last):
|
|
File "/usr/lib64/python3.6/site-packages/dbus/connection.py", line 521, in _signal_func
|
|
def _signal_func(self, message):
|
|
File "/usr/lib/python3.6/site-packages/setroubleshoot/server.py", line 114, in sighandler
|
|
sys.exit()
|
|
---
|
|
framework/src/setroubleshoot/server.py | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/framework/src/setroubleshoot/server.py b/framework/src/setroubleshoot/server.py
|
|
index 7093bff..ccabff5 100755
|
|
--- a/framework/src/setroubleshoot/server.py
|
|
+++ b/framework/src/setroubleshoot/server.py
|
|
@@ -113,8 +113,6 @@ def sighandler(signum, frame):
|
|
log_debug("reloading configuration file")
|
|
config.config_init()
|
|
return
|
|
- import sys
|
|
- sys.exit()
|
|
|
|
def make_instance_id():
|
|
import time
|
|
@@ -710,9 +708,6 @@ def RunFaultServer(timeout=10):
|
|
global host_database, analysis_queue, email_recipients
|
|
|
|
signal.signal(signal.SIGHUP, sighandler)
|
|
- signal.signal(signal.SIGQUIT, sighandler)
|
|
- signal.signal(signal.SIGTERM, sighandler)
|
|
- signal.signal(signal.SIGALRM, sighandler)
|
|
|
|
#interface_registry.dump_interfaces()
|
|
|
|
--
|
|
2.14.1
|
|
|