moved abrt.socket and abrtd.lock into /var/run/abrt making selinux happy

3 files changed, 18 insertions, 15 deletions

diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 83fc94af..3557eed3 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -87,7 +87,7 @@ using namespace std;
  */
 
 
-#define VAR_RUN_LOCK_FILE   VAR_RUN"/abrtd.lock"
+#define VAR_RUN_LOCK_FILE   VAR_RUN"/abrt/abrtd.lock"
 #define VAR_RUN_PIDFILE     VAR_RUN"/abrtd.pid"
 
 
diff --git a/src/Daemon/dumpsocket.cpp b/src/Daemon/dumpsocket.cpp
index a88c24b6..699a0609 100644
--- a/src/Daemon/dumpsocket.cpp
+++ b/src/Daemon/dumpsocket.cpp
@@ -27,7 +27,7 @@
 #include "hooklib.h"
 #include "strbuf.h"
 
-#define SOCKET_FILE VAR_RUN"/abrt.socket"
+#define SOCKET_FILE VAR_RUN"/abrt/abrt.socket"
 #define SOCKET_PERMISSION 0666
 
 /* Maximal length of backtrace. */
diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in
index 99817296..dd6fbaed 100644
--- a/src/Hooks/abrt_exception_handler.py.in
+++ b/src/Hooks/abrt_exception_handler.py.in
@@ -34,19 +34,22 @@ def write_dump(pid, tb):
         executable = os.path.abspath(sys.argv[0])
 
     # Open ABRT daemon's socket and write data to it.
-    s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    s.connect(@VAR_RUN@ + "/abrt.socket")
-    s.sendall("PID=%s\0" % pid)
-    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.sendall("DONE\0")
-    s.close()
+    try:
+        s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        s.connect(@VAR_RUN@ + "/abrt/abrt.socket")
+        s.sendall("PID=%s\0" % pid)
+        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.sendall("DONE\0")
+        s.close()
+    except Exception, ex:
+        syslog.syslog("can't communicate with ABRT daemon, is it running? %s", str(ex))
 
 def handleMyException((etype, value, tb)):
     """