Merge branch 'master' of ssh://vda@git.fedorahosted.org/git/abrt

9 files changed, 50 insertions, 3 deletions

diff --git a/lib/CommLayer/CommLayerServerDBus.cpp b/lib/CommLayer/CommLayerServerDBus.cpp
index ad3c2db7..029cc91c 100644
--- a/lib/CommLayer/CommLayerServerDBus.cpp
+++ b/lib/CommLayer/CommLayerServerDBus.cpp
@@ -22,7 +22,11 @@ CCommLayerServerDBus::CCommLayerServerDBus()
     }
     catch(DBus::Error err)
     {
-        throw CABRTException(EXCEP_FATAL, "CCommLayerServerDBus::CCommLayerServerDBus(): Error while requesting dbus name - have you reloaded the dbus settings?");
+        throw CABRTException(EXCEP_FATAL, std::string(__func__) + 
+                             "\nPlease check if:\n"
+                             + " * abrt is being run with root permissions\n"
+                             + " * you have reloaded the dbus\n"+
+                             + "Original exception was:\n " + err.what());
     }
 
 }
@@ -103,3 +107,11 @@ void CCommLayerServerDBus::JobDone(const std::string &pDest, uint64_t pJobID)
 {
     CDBusServer_adaptor::JobDone(pDest, pJobID);
 }
+
+vector_map_string_string_t CCommLayerServerDBus::GetPluginsInfo()
+{
+    //FIXME: simplify?
+    vector_map_string_string_t plugins_info;
+    plugins_info = m_pObserver->GetPluginsInfo();
+    return plugins_info;
+}
diff --git a/lib/CommLayer/CommLayerServerDBus.h b/lib/CommLayer/CommLayerServerDBus.h
index df5d93d5..9301a10a 100644
--- a/lib/CommLayer/CommLayerServerDBus.h
+++ b/lib/CommLayer/CommLayerServerDBus.h
@@ -26,6 +26,7 @@ class CCommLayerServerDBus
         virtual bool Report(map_crash_report_t pReport,const std::string &pSender);
         virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pSender);
         virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pSender);
+        virtual vector_map_string_string_t GetPluginsInfo();
 
         virtual void Crash(const std::string& arg1);
         virtual void AnalyzeComplete(map_crash_report_t arg1);
diff --git a/lib/CommLayer/DBusCommon.h b/lib/CommLayer/DBusCommon.h
index 0ea94d3b..cdf30751 100644
--- a/lib/CommLayer/DBusCommon.h
+++ b/lib/CommLayer/DBusCommon.h
@@ -22,3 +22,5 @@
 #define CC_DBUS_IFACE "com.redhat.abrt"
 
 #include "CrashTypes.h"
+typedef std::map<std::string, std::string> map_string_string_t;
+typedef std::vector<map_string_string_t> vector_map_string_string_t;
diff --git a/lib/CommLayer/DBusServerProxy.cpp b/lib/CommLayer/DBusServerProxy.cpp
index d4aee84d..6bf0fbde 100644
--- a/lib/CommLayer/DBusServerProxy.cpp
+++ b/lib/CommLayer/DBusServerProxy.cpp
@@ -30,6 +30,7 @@ CDBusServer_adaptor::CDBusServer_adaptor()
     register_method(CDBusServer_adaptor, Report, _Report_stub);
     register_method(CDBusServer_adaptor, DeleteDebugDump, _DeleteDebugDump_stub);
     register_method(CDBusServer_adaptor, GetJobResult, _GetJobResult_stub);
+    register_method(CDBusServer_adaptor, GetPluginsInfo, _GetPluginsInfo_stub);
 }
 /* reveal Interface introspection when we stabilize the API */
 /*
@@ -193,3 +194,13 @@ DBus::Message CDBusServer_adaptor::_GetJobResult_stub(const DBus::CallMessage &c
     wi << report;
     return reply;
 }
+
+DBus::Message CDBusServer_adaptor::_GetPluginsInfo_stub(const DBus::CallMessage &call)
+{
+    vector_map_string_string_t plugins_info;
+    plugins_info = GetPluginsInfo();
+    DBus::ReturnMessage reply(call);
+    DBus::MessageIter wi = reply.writer();
+    wi << plugins_info;
+    return reply;
+}
diff --git a/lib/CommLayer/DBusServerProxy.h b/lib/CommLayer/DBusServerProxy.h
index ae597e25..78fb28b3 100644
--- a/lib/CommLayer/DBusServerProxy.h
+++ b/lib/CommLayer/DBusServerProxy.h
@@ -48,6 +48,7 @@ public:
      virtual bool Report(map_crash_report_t pReport, const std::string &pDBusSender) = 0;
      virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0;
      virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pDBusSender) = 0;
+     virtual vector_map_string_string_t GetPluginsInfo() = 0;
 
 public:
     /* signal emitters for this interface
@@ -69,6 +70,7 @@ private:
     DBus::Message _Report_stub(const DBus::CallMessage &call);
     DBus::Message _DeleteDebugDump_stub(const DBus::CallMessage &call);
     DBus::Message _GetJobResult_stub(const DBus::CallMessage &call);
+    DBus::Message _GetPluginsInfo_stub(const DBus::CallMessage &call);
 };
 
 #endif
diff --git a/lib/CommLayer/Observer.h b/lib/CommLayer/Observer.h
index 880a7923..81e7695e 100644
--- a/lib/CommLayer/Observer.h
+++ b/lib/CommLayer/Observer.h
@@ -1,7 +1,8 @@
 #ifndef OBSERVER_H_
 #define OBSERVER_H_
 
-#include "CrashTypes.h"
+//FIXME: move all common types to AbrtTypes.h ??
+#include "DBusCommon.h"
 #include <string>
 #include <stdint.h>
 
@@ -19,6 +20,7 @@ class CObserver {
         virtual bool Report(map_crash_report_t pReport, const std::string &pSender) = 0;
         virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pSender) = 0;
         virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string &pSender) = 0;
+        virtual vector_map_string_string_t GetPluginsInfo() = 0;
 };
 
 #endif /* OBSERVER_H_ */
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 8e102c01..c64e22a0 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -871,3 +871,19 @@ map_crash_report_t CCrashWatcher::GetJobResult(uint64_t pJobID, const std::strin
     */
     return pending_jobs[pSender][pJobID];
 }
+
+vector_map_string_string_t CCrashWatcher::GetPluginsInfo()
+{
+    try
+    {
+        return m_pMW->GetPluginsInfo();
+    }
+    catch(CABRTException &e)
+    {
+        if (e.type() == EXCEP_FATAL)
+        {
+            throw e;
+        }
+        Warning(e.what());
+    }
+}
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index bc71269d..420acc40 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -131,6 +131,7 @@ class CCrashWatcher
         virtual bool Report(map_crash_report_t pReport, const std::string &pUID);
         virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pUID);
         virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pSender);
+        virtual vector_map_string_string_t GetPluginsInfo();
 
         /* Observer methods */
         void Status(const std::string& pMessage,const std::string& pDest="0");
diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in
index 1532357a..f4ebbb56 100644
--- a/src/Hooks/abrt_exception_handler.py.in
+++ b/src/Hooks/abrt_exception_handler.py.in
@@ -248,7 +248,7 @@ def handleMyException((etype, value, tb)):
 
     # add coredump saving
     write_dump(os.getpid(), tb_uuid, text)
-    sys.exit(__EXITCODE)
+    return sys.__excepthook__(etype, value, tb)
 
 def installExceptionHandler(debug = 1):
     """