diff options
Diffstat (limited to 'lib/MiddleWare')
| -rw-r--r-- | lib/MiddleWare/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/MiddleWare/PluginManager.cpp | 29 | ||||
| -rw-r--r-- | lib/MiddleWare/test.cpp | 11 |
3 files changed, 22 insertions, 20 deletions
diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am index 1a35bcc..c6aa8cf 100644 --- a/lib/MiddleWare/Makefile.am +++ b/lib/MiddleWare/Makefile.am @@ -8,7 +8,7 @@ libABRTMiddleWare_la_SOURCES = MiddleWare.cpp MiddleWare.h PluginManager.cpp \ Reporter.h Analyzer.h 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) +libABRTMiddleWare_la_CPPFLAGS = -I$(srcdir)/../Utils -I$(srcdir)/../CommLayer $(RPM_CFLAGS) check_PROGRAMS = test test_SOURCES = test.cpp diff --git a/lib/MiddleWare/PluginManager.cpp b/lib/MiddleWare/PluginManager.cpp index 2ab314b..f3d89e5 100644 --- a/lib/MiddleWare/PluginManager.cpp +++ b/lib/MiddleWare/PluginManager.cpp @@ -21,7 +21,8 @@ #include <iostream> #include "PluginManager.h" -#include <ABRTException.h> +#include "ABRTException.h" +#include "CommLayer.h" #include <dirent.h> #include <stdio.h> #include <sys/types.h> @@ -83,7 +84,7 @@ void CPluginManager::LoadPlugin(const std::string& pName) { throw CABRTException(EXCEP_PLUGIN, "CPluginManager::LoadPlugin(): non-compatible plugin"); } - std::cerr << "Plugin " << pName << " (" << abrtPlugin->GetVersion() << ") " << "succesfully loaded." << std::endl; + CommLayerInner::debug("Plugin " + pName + " (" + abrtPlugin->GetVersion() + ") succesfully loaded."); m_mapABRTPlugins[pName] = abrtPlugin; } catch (CABRTException& e) @@ -92,8 +93,8 @@ void CPluginManager::LoadPlugin(const std::string& pName) { delete abrtPlugin; } - std::cerr << e.what() << std::endl; - std::cerr << "Failed to load plugin " << pName << std::endl; + CommLayerInner::debug("CPluginManager::LoadPlugin(): " + e.what()); + CommLayerInner::debug("Failed to load plugin " + pName); } } } @@ -105,7 +106,7 @@ void CPluginManager::UnLoadPlugin(const std::string& pName) UnRegisterPlugin(pName); delete m_mapABRTPlugins[pName]; m_mapABRTPlugins.erase(pName); - std::cerr << "Plugin " << pName << " sucessfully unloaded." << std::endl; + CommLayerInner::debug("Plugin " + pName + " sucessfully unloaded."); } } @@ -125,16 +126,16 @@ void CPluginManager::RegisterPlugin(const std::string& pName) } catch (std::string sError) { - std::cerr << "Can not initialize plugin " << pName << "(" - << plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()] - << ")" << std::endl; + CommLayerInner::debug("Can not initialize plugin " + pName + "(" + + std::string(plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()]) + + ")"); UnLoadPlugin(pName); return; } m_mapPlugins[pName] = plugin; - std::cerr << "Registred plugin " << pName << "(" - << plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()] - << ")" << std::endl; + CommLayerInner::debug("Registred plugin " + pName + "(" + + std::string(plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()]) + + ")"); } } } @@ -148,9 +149,9 @@ void CPluginManager::UnRegisterPlugin(const std::string& pName) m_mapPlugins[pName]->DeInit(); delete m_mapPlugins[pName]; m_mapPlugins.erase(pName); - std::cerr << "UnRegistred plugin " << pName << "(" - << plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()] - << ")" << std::endl; + CommLayerInner::debug("UnRegistred plugin " + pName + "(" + + std::string(plugin_type_str_t[m_mapABRTPlugins[pName]->GetType()]) + + ")"); } } } diff --git a/lib/MiddleWare/test.cpp b/lib/MiddleWare/test.cpp index c44b5cc..79cadd3 100644 --- a/lib/MiddleWare/test.cpp +++ b/lib/MiddleWare/test.cpp @@ -37,19 +37,19 @@ int main(int argc, char** argv) } try { - //std::string(CONF_DIR) + "/abrt.conf" CMiddleWare middleWare(PLUGINS_CONF_DIR, PLUGINS_LIB_DIR); - /* Create DebugDump */ - /* Try to save it into DB */ middleWare.RegisterPlugin("CCpp"); + middleWare.RegisterPlugin("Mailx"); middleWare.RegisterPlugin("Logger"); middleWare.RegisterPlugin("RunApp"); middleWare.RegisterPlugin("SQLite3"); middleWare.SetDatabase("SQLite3"); middleWare.SetOpenGPGCheck(false); - middleWare.AddAnalyzerReporter("CCpp", "Logger"); - middleWare.AddAnalyzerAction("CCpp", "RunApp", "date,action_date"); + middleWare.AddReporter("Logger"); + middleWare.AddAnalyzerReporter("CCpp", "Mailx"); + middleWare.AddAnalyzerAction("CCpp", "RunApp", "date"); + /* Try to save it into DB */ map_crash_info_t crashInfo; if (middleWare.SaveDebugDump(argv[1], crashInfo)) { @@ -58,6 +58,7 @@ int main(int argc, char** argv) crashInfo[CD_EXECUTABLE][CD_CONTENT] << ", " << crashInfo[CD_COUNT][CD_CONTENT] << ", " << std::endl; + middleWare.Report(argv[1]); /* Get Report, so user can change data (remove private stuff) * If we do not want user interaction, just send data immediately */ |