diff options
| author | Zdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com> | 2009-04-29 12:46:18 +0200 |
|---|---|---|
| committer | Zdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com> | 2009-04-29 12:46:18 +0200 |
| commit | 1e752b178131fa0268151219deb35e09c40e29bc (patch) | |
| tree | 0b6bbed34179f605d7e6759211a010edea19f9d5 /src | |
| parent | 52291c1024050d25967b5640b04d67166b7728d2 (diff) | |
| download | abrt-1e752b178131fa0268151219deb35e09c40e29bc.tar.gz abrt-1e752b178131fa0268151219deb35e09c40e29bc.tar.xz abrt-1e752b178131fa0268151219deb35e09c40e29bc.zip | |
rework commlayerinner usage
new lock method in debugdump
Diffstat (limited to 'src')
| -rw-r--r-- | src/Daemon/CrashWatcher.cpp | 6 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 0146fab4..2a2f05b6 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -30,7 +30,7 @@ #include <sstream> #include <dirent.h> #include <cstring> -#include "ABRTCommLayer.h" +#include "CommLayerInner.h" #include "ABRTException.h" /* just a helper function @@ -215,7 +215,7 @@ CCrashWatcher::CCrashWatcher(const std::string& pPath) // TODO: initialize object according parameters -w -d // status has to be always created. m_pCommLayerInner = new CCommLayerInner(this, true, true); - ABRTCommLayer::init_comm_layer_inner(m_pCommLayerInner); + comm_layer_inner_init(m_pCommLayerInner); m_pSettings = new CSettings(); m_pSettings->LoadSettings(std::string(CONF_DIR) + "/abrt.conf"); @@ -289,7 +289,7 @@ void CCrashWatcher::FindNewDumps(const std::string& pPath) std::cerr << "Saving debugdeump: " << *itt << std::endl; try { - if(m_pMW->SaveDebugDump(*itt, crashinfo) == 0) + if(m_pMW->SaveDebugDump(*itt, crashinfo)) { std::cerr << "Saved new entry: " << *itt << std::endl; m_pMW->Report(*itt); diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index 84013d49..2462b30d 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -1,14 +1,13 @@ sbin_PROGRAMS = abrt abrt_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp DBusServerProxy.h \ DBusCommon.h Settings.h Settings.cpp -abrt_CPPFLAGS = -Wall -Werror -rdynamic -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer\ +abrt_CPPFLAGS = -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer\ -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils\ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ -DCONF_DIR=\"$(CONF_DIR)\" abrt_LDADD = ../../lib/MiddleWare/libABRTMiddleWare.la ../../lib/CommLayer/libABRTCommLayer.la $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS) -#abrt_LDFLAGS = -Wl,--dynamic-list,exported-symbols dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/ dist_dbusabrtconf_DATA = dbus-abrt.conf |