Attachment 585214 Details for Bug 753505 – Proposed patch

[patch] Proposed patch

socket_timeout.patch (text/plain), 2.43 KB, created by Jiri Moskovcak on 2012-05-17 13:02:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Moskovcak

Created: 2012-05-17 13:02:14 UTC

Size: 2.43 KB

patch

obsolete

>commit d99b6e0e3d53c79472a9d2929f7e136f4bf6126e
>Author: Jiri Moskovcak <jmoskovc@redhat.com>
>Date:   Wed Apr 11 15:31:34 2012 +0200
>
>    pyhook: add timetout to sockets rhbz#808562
>
>diff --git a/src/hooks/abrt_exception_handler.py.in b/src/hooks/abrt_exception_handler.py.in
>index 9522a0f..cc00fc7 100644
>--- a/src/hooks/abrt_exception_handler.py.in
>+++ b/src/hooks/abrt_exception_handler.py.in
>@@ -37,26 +37,32 @@ def write_dump(tb):
>     try:
>         import socket
>         s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
>-        s.connect(@VAR_RUN@ + "/abrt/abrt.socket")
>-        s.sendall("PUT / HTTP/1.1\r\n\r\n")
>-        s.sendall("PID=%s\0" % os.getpid())
>-        s.sendall("EXECUTABLE=%s\0" % executable)
>-        s.sendall("ANALYZER=Python\0")
>-        s.sendall("BASENAME=pyhook\0")
>-        # This handler puts a short(er) crash descr in 1st line of the backtrace.
>-        # Example:
>-        # CCMainWindow.py:1:<module>:ZeroDivisionError: integer division or modulo by zero
>-        s.sendall("REASON=%s\0" % tb.splitlines()[0])
>-        s.sendall("BACKTRACE=%s\0" % tb)
>-        s.shutdown(socket.SHUT_WR)
>-
>-        # Read the response and log if there's anything wrong
>-        response = ""
>-        while True:
>-            buf = s.recv(256)
>-            if not buf:
>-                break;
>-            response += buf
>+        s.settimeout(5)
>+        try:
>+            s.connect(@VAR_RUN@ + "/abrt/abrt.socket")
>+            s.sendall("PUT / HTTP/1.1\r\n\r\n")
>+            s.sendall("PID=%s\0" % os.getpid())
>+            s.sendall("EXECUTABLE=%s\0" % executable)
>+            s.sendall("ANALYZER=Python\0")
>+            s.sendall("BASENAME=pyhook\0")
>+            # This handler puts a short(er) crash descr in 1st line of the backtrace.
>+            # Example:
>+            # CCMainWindow.py:1:<module>:ZeroDivisionError: integer division or modulo by zero
>+            s.sendall("REASON=%s\0" % tb.splitlines()[0])
>+            s.sendall("BACKTRACE=%s\0" % tb)
>+            s.shutdown(socket.SHUT_WR)
>+
>+
>+            # Read the response and log if there's anything wrong
>+            response = ""
>+            while True:
>+                buf = s.recv(256)
>+                if not buf:
>+                    break
>+                response += buf
>+        except socket.timeout, ex:
>+            import syslog
>+            syslog.syslog("communication with ABRT daemon failed: %s" % str(ex))
> 
>         s.close()
>         parts = response.split()

Actions: View | Diff

Attachments on bug 753505: 533308 | 533309 | 546290 | 585214