renamed MW library

renamed Utils library
added check for plugins init method
renamed crash types

5 files changed, 59 insertions, 48 deletions

diff --git a/lib/MiddleWare/CrashTypes.h b/lib/MiddleWare/CrashTypes.h
index 69b5cd4..3dc3f4e 100644
--- a/lib/MiddleWare/CrashTypes.h
+++ b/lib/MiddleWare/CrashTypes.h
@@ -19,18 +19,19 @@
 #define CD_EDITABLE     (1)
 #define CD_CONTENT      (2)
 
-#define CI_UUID         "UUID"
-#define CI_UID          "UID"
-#define CI_COUNT        "Count"
-#define CI_EXECUTABLE   "Executable"
-#define CI_PACKAGE      "Package"
-#define CI_DESCRIPTION  "Description"
-#define CI_TIME         "Time"
-#define CI_REPORTED     "Reported"
-#define CI_COMMENT      "Comment"
-#define CI_MWANALYZER   "_MWAnalyzer"
-#define CI_MWUID        "_MWUID"
-#define CI_MWUUID       "_MWUUID"
+#define CD_UUID         "UUID"
+#define CD_UID          "UID"
+#define CD_COUNT        "Count"
+#define CD_EXECUTABLE   "Executable"
+#define CD_PACKAGE      "Package"
+#define CD_DESCRIPTION  "Description"
+#define CD_TIME         "Time"
+#define CD_REPORTED     "Reported"
+#define CD_COMMENT      "Comment"
+#define CD_REPRODUCE    "How to reproduce"
+#define CD_MWANALYZER   "_MWAnalyzer"
+#define CD_MWUID        "_MWUID"
+#define CD_MWUUID       "_MWUUID"
 
 // now, size of a vecor is always 3 -> <type, editable, content>
 typedef std::vector<std::string> vector_strings_t;
@@ -43,10 +44,9 @@ typedef map_crash_data_t map_crash_report_t;
 
 inline void add_crash_data_to_crash_info(map_crash_info_t& pCrashInfo,
                                          const std::string& pItem,
-                                         const std::string& pType,
                                          const std::string& pContent)
 {
-    pCrashInfo[pItem].push_back(pType);
+    pCrashInfo[pItem].push_back(CD_TXT);
     pCrashInfo[pItem].push_back(CD_ISNOTEDITABLE);
     pCrashInfo[pItem].push_back(pContent);
 }
diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am
index f5280ea..1a35bcc 100644
--- a/lib/MiddleWare/Makefile.am
+++ b/lib/MiddleWare/Makefile.am
@@ -1,18 +1,18 @@
-lib_LTLIBRARIES = libMiddleWare.la
-libMiddleWare_la_SOURCES = MiddleWare.cpp MiddleWare.h PluginManager.cpp \
+lib_LTLIBRARIES = libABRTMiddleWare.la
+libABRTMiddleWare_la_SOURCES = MiddleWare.cpp MiddleWare.h PluginManager.cpp \
                            PluginManager.h ABRTPlugin.cpp \
                            ABRTPlugin.h DynamicLibrary.cpp \
                            DynamicLibrary.h \
                            RPM.cpp RPM.h Plugin.h CrashTypes.h \
                            MiddleWareTypes.h Action.h Database.h \
                            Reporter.h Analyzer.h
-libMiddleWare_la_LIBADD = $(DL_LIBS) ../Utils/libUtils.la  $(RPM_LIBS)
-libMiddleWare_la_LDFLAGS = -version-info 0:1:0
-libMiddleWare_la_CPPFLAGS = -I$(srcdir)/../Utils  $(RPM_CFLAGS)
+libABRTMiddleWare_la_LIBADD = $(DL_LIBS) ../Utils/libABRTUtils.la  $(RPM_LIBS)
+libABRTMiddleWare_la_LDFLAGS = -version-info 0:1:0
+libABRTMiddleWare_la_CPPFLAGS = -I$(srcdir)/../Utils  $(RPM_CFLAGS)
 
 check_PROGRAMS = test
 test_SOURCES = test.cpp
-test_LDADD = ../Utils/libUtils.la libMiddleWare.la $(DL_LIBS) $(RPM_LIBS)
+test_LDADD = ../Utils/libABRTUtils.la libABRTMiddleWare.la $(DL_LIBS) $(RPM_LIBS)
 test_CPPFLAGS = -I$(srcdir)/../Utils \
                 -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
                 -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
diff --git a/lib/MiddleWare/MiddleWare.cpp b/lib/MiddleWare/MiddleWare.cpp
index 29121db..9d1fd43 100644
--- a/lib/MiddleWare/MiddleWare.cpp
+++ b/lib/MiddleWare/MiddleWare.cpp
@@ -75,7 +75,7 @@ void CMiddleWare::DebugDumpToCrashReport(const std::string& pDebugDumpDir, map_c
             {
                 add_crash_data_to_crash_report(pCrashReport, fileName, CD_TXT, CD_ISNOTEDITABLE, content);
             }
-            else
+            else if (fileName != FILENAME_UID)
             {
                 add_crash_data_to_crash_report(pCrashReport, fileName, CD_TXT, CD_ISEDITABLE, content);
             }
@@ -115,7 +115,7 @@ void CMiddleWare::CreateReport(const std::string& pAnalyzer,
     CAnalyzer* analyzer = m_pPluginManager->GetAnalyzer(pAnalyzer);
     return analyzer->CreateReport(pDebugDumpDir);
 }
-
+#include <iostream>
 void CMiddleWare::CreateCrashReport(const std::string& pUUID,
                                     const std::string& pUID,
                                     map_crash_report_t& pCrashReport)
@@ -154,23 +154,24 @@ void CMiddleWare::CreateCrashReport(const std::string& pUUID,
     RunAnalyzerActions(analyzer, row.m_sDebugDumpDir);
     DebugDumpToCrashReport(row.m_sDebugDumpDir, pCrashReport);
 
-    add_crash_data_to_crash_report(pCrashReport, CI_MWANALYZER, CD_SYS, CD_ISNOTEDITABLE, analyzer);
-    add_crash_data_to_crash_report(pCrashReport, CI_MWUID, CD_SYS, CD_ISNOTEDITABLE, pUID);
-    add_crash_data_to_crash_report(pCrashReport, CI_MWUUID, CD_SYS, CD_ISNOTEDITABLE, pUUID);
-    add_crash_data_to_crash_report(pCrashReport, CI_COMMENT, CD_TXT, CD_ISEDITABLE, "");
+    add_crash_data_to_crash_report(pCrashReport, CD_MWANALYZER, CD_SYS, CD_ISNOTEDITABLE, analyzer);
+    add_crash_data_to_crash_report(pCrashReport, CD_MWUID, CD_SYS, CD_ISNOTEDITABLE, pUID);
+    add_crash_data_to_crash_report(pCrashReport, CD_MWUUID, CD_SYS, CD_ISNOTEDITABLE, pUUID);
+    add_crash_data_to_crash_report(pCrashReport, CD_COMMENT, CD_TXT, CD_ISEDITABLE, "");
+    add_crash_data_to_crash_report(pCrashReport, CD_REPRODUCE, CD_TXT, CD_ISEDITABLE, "1.\n2.\n3.\n");
 }
 
 void CMiddleWare::Report(const map_crash_report_t& pCrashReport)
 {
-    if (pCrashReport.find(CI_MWANALYZER) == pCrashReport.end() ||
-        pCrashReport.find(CI_MWUID) == pCrashReport.end() ||
-        pCrashReport.find(CI_MWUUID) == pCrashReport.end())
+    if (pCrashReport.find(CD_MWANALYZER) == pCrashReport.end() ||
+        pCrashReport.find(CD_MWUID) == pCrashReport.end() ||
+        pCrashReport.find(CD_MWUUID) == pCrashReport.end())
     {
         throw std::string("CMiddleWare::Report(): Important data are missing.");
     }
-    std::string analyzer = pCrashReport.find(CI_MWANALYZER)->second[CD_CONTENT];
-    std::string UID = pCrashReport.find(CI_MWUID)->second[CD_CONTENT];
-    std::string UUID = pCrashReport.find(CI_MWUUID)->second[CD_CONTENT];
+    std::string analyzer = pCrashReport.find(CD_MWANALYZER)->second[CD_CONTENT];
+    std::string UID = pCrashReport.find(CD_MWUID)->second[CD_CONTENT];
+    std::string UUID = pCrashReport.find(CD_MWUUID)->second[CD_CONTENT];
 
     if (m_mapAnalyzerReporters.find(analyzer) != m_mapAnalyzerReporters.end())
     {
@@ -403,17 +404,17 @@ map_crash_info_t CMiddleWare::GetCrashInfo(const std::string& pUUID,
 
     std::string data;
     dd.LoadText(FILENAME_EXECUTABLE, data);
-    add_crash_data_to_crash_info(crashInfo, CI_EXECUTABLE, CD_TXT, data);
+    add_crash_data_to_crash_info(crashInfo, CD_EXECUTABLE, data);
     dd.LoadText(FILENAME_PACKAGE, data);
-    add_crash_data_to_crash_info(crashInfo, CI_PACKAGE, CD_TXT, data);
+    add_crash_data_to_crash_info(crashInfo, CD_PACKAGE, data);
     dd.LoadText(FILENAME_DESCRIPTION, data);
-    add_crash_data_to_crash_info(crashInfo, CI_DESCRIPTION, CD_TXT, data);
+    add_crash_data_to_crash_info(crashInfo, CD_DESCRIPTION, data);
     dd.Close();
-    add_crash_data_to_crash_info(crashInfo, CI_UUID, CD_TXT, row.m_sUUID);
-    add_crash_data_to_crash_info(crashInfo, CI_UID, CD_TXT, row.m_sUID);
-    add_crash_data_to_crash_info(crashInfo, CI_COUNT, CD_TXT, row.m_sCount);
-    add_crash_data_to_crash_info(crashInfo, CI_TIME, CD_TXT, row.m_sTime);
-    add_crash_data_to_crash_info(crashInfo, CI_REPORTED, CD_TXT, row.m_sReported);
+    add_crash_data_to_crash_info(crashInfo, CD_UUID, row.m_sUUID);
+    add_crash_data_to_crash_info(crashInfo, CD_UID, row.m_sUID);
+    add_crash_data_to_crash_info(crashInfo, CD_COUNT, row.m_sCount);
+    add_crash_data_to_crash_info(crashInfo, CD_TIME, row.m_sTime);
+    add_crash_data_to_crash_info(crashInfo, CD_REPORTED, row.m_sReported);
 
     return crashInfo;
 }
diff --git a/lib/MiddleWare/PluginManager.cpp b/lib/MiddleWare/PluginManager.cpp
index 00c54fa..2f103f2 100644
--- a/lib/MiddleWare/PluginManager.cpp
+++ b/lib/MiddleWare/PluginManager.cpp
@@ -116,8 +116,19 @@ void CPluginManager::RegisterPlugin(const std::string& pName)
         {
             std::string path = m_sPlugisConfDir + "/" + pName + "." + PLUGINS_CONF_EXTENSION;
             CPlugin* plugin = m_mapABRTPlugins[pName]->PluginNew();
-            plugin->Init();
-            plugin->LoadSettings(path);
+            try
+            {
+                plugin->Init();
+                plugin->LoadSettings(path);
+            }
+            catch (std::string sError)
+            {
+                std::cerr << "Can not initialize plugin " << pName << "("
+                          << plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()]
+                          << ")" << std::endl;
+                UnLoadPlugin(pName);
+                return;
+            }
             m_mapPlugins[pName] = plugin;
             std::cerr << "Registred plugin " << pName << "("
                       << plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()]
diff --git a/lib/MiddleWare/test.cpp b/lib/MiddleWare/test.cpp
index 9422b0b..c44b5cc 100644
--- a/lib/MiddleWare/test.cpp
+++ b/lib/MiddleWare/test.cpp
@@ -50,21 +50,20 @@ int main(int argc, char** argv)
         middleWare.SetOpenGPGCheck(false);
         middleWare.AddAnalyzerReporter("CCpp", "Logger");
         middleWare.AddAnalyzerAction("CCpp", "RunApp", "date,action_date");
-        std::cout << "sasas" <<std::endl;
         map_crash_info_t crashInfo;
         if (middleWare.SaveDebugDump(argv[1], crashInfo))
         {
             std::cout << "Application Crashed! " <<
-                         crashInfo[item_crash_into_t_str[CI_PACKAGE]][CD_CONTENT] << ", " <<
-                         crashInfo[item_crash_into_t_str[CI_EXECUTABLE]][CD_CONTENT] << ", " <<
-                         crashInfo[item_crash_into_t_str[CI_COUNT]][CD_CONTENT] << ", " << std::endl;
+                         crashInfo[CD_PACKAGE][CD_CONTENT] << ", " <<
+                         crashInfo[CD_EXECUTABLE][CD_CONTENT] << ", " <<
+                         crashInfo[CD_COUNT][CD_CONTENT] << ", " << std::endl;
 
             /* Get Report, so user can change data (remove private stuff)
              * If we do not want user interaction, just send data immediately
              */
             map_crash_report_t crashReport;
-            middleWare.CreateCrashReport(crashInfo[item_crash_into_t_str[CI_UUID]][CD_CONTENT],
-                                         crashInfo[item_crash_into_t_str[CI_UID]][CD_CONTENT],
+            middleWare.CreateCrashReport(crashInfo[CD_UUID][CD_CONTENT],
+                                         crashInfo[CD_UID][CD_CONTENT],
                                          crashReport);
             /* Report crash */
             middleWare.Report(crashReport);