e22a60e70f
- Fix plugin exception reporting - Update translations - Stop SetroubleshootFixit after 10 seconds of inactivity - Do not use Python slip package Resolves: rhbz#1949834
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 56cf1525b5ebeb3591d4a3ded5299fe82d0f9208 Mon Sep 17 00:00:00 2001
|
|
From: Petr Lautrbach <plautrba@redhat.com>
|
|
Date: Wed, 14 Apr 2021 17:03:39 +0200
|
|
Subject: [PATCH] Stop SetroubleshootFixit after 10 seconds of inactivity
|
|
|
|
---
|
|
framework/src/SetroubleshootFixit.py | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/framework/src/SetroubleshootFixit.py b/framework/src/SetroubleshootFixit.py
|
|
index 15c6cab1cda4..f7cbf95f182f 100644
|
|
--- a/framework/src/SetroubleshootFixit.py
|
|
+++ b/framework/src/SetroubleshootFixit.py
|
|
@@ -7,6 +7,7 @@ from gi.repository import GLib
|
|
import slip.dbus.service
|
|
from slip.dbus import polkit
|
|
import os
|
|
+import signal
|
|
|
|
|
|
class RunFix(slip.dbus.service.Object):
|
|
@@ -14,12 +15,20 @@ class RunFix(slip.dbus.service.Object):
|
|
|
|
def __init__(self, *p, **k):
|
|
super(RunFix, self).__init__(*p, **k)
|
|
+ self.timeout = 10
|
|
+ self.alarm(self.timeout)
|
|
+
|
|
+ def alarm(self, timeout=10):
|
|
+ signal.alarm(timeout)
|
|
+
|
|
|
|
@dbus.service.method("org.fedoraproject.SetroubleshootFixit", in_signature='ss', out_signature='s')
|
|
def run_fix(self, local_id, analysis_id):
|
|
import subprocess
|
|
+ self.alarm(0)
|
|
command = ["sealert", "-f", local_id, "-P", analysis_id]
|
|
return subprocess.check_output(command, universal_newlines=True)
|
|
+ self.alarm(self.timeout)
|
|
|
|
if __name__ == "__main__":
|
|
mainloop = GLib.MainLoop()
|
|
--
|
|
2.31.1
|
|
|