diff options
Diffstat (limited to 'src/Daemon')
| -rw-r--r-- | src/Daemon/CrashWatcher.cpp | 10 | ||||
| -rw-r--r-- | src/Daemon/CrashWatcher.h | 4 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 85a705c..0146fab 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -30,7 +30,7 @@ #include <sstream> #include <dirent.h> #include <cstring> -#include "CommLayer.h" +#include "ABRTCommLayer.h" #include "ABRTException.h" /* just a helper function @@ -212,11 +212,10 @@ CCrashWatcher::CCrashWatcher(const std::string& pPath) int watch = 0; m_sTarget = pPath; - // TODO: initialize object according parameters -w -i + // TODO: initialize object according parameters -w -d // status has to be always created. - CommLayerInner::init_status(this); - CommLayerInner::init_warning(this); - CommLayerInner::init_debug(this); + m_pCommLayerInner = new CCommLayerInner(this, true, true); + ABRTCommLayer::init_comm_layer_inner(m_pCommLayerInner); m_pSettings = new CSettings(); m_pSettings->LoadSettings(std::string(CONF_DIR) + "/abrt.conf"); @@ -255,6 +254,7 @@ CCrashWatcher::~CCrashWatcher() delete m_pCommLayer; delete m_pMW; delete m_pSettings; + delete m_pCommLayerInner; } void CCrashWatcher::FindNewDumps(const std::string& pPath) { diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h index d20cecf..deba901 100644 --- a/src/Daemon/CrashWatcher.h +++ b/src/Daemon/CrashWatcher.h @@ -28,7 +28,6 @@ //#include "DBusServerProxy.h" #include "MiddleWare.h" #include "Settings.h" -#include "CommLayerInner.h" //FIXME remove when it gets to autoconf #include "CommLayerServerDBus.h" @@ -37,11 +36,11 @@ #elif HAVE_SOCKET #include "CommLayerServerSocket.h" #endif +#include "CommLayerInner.h" // 1024 simultaneous actions #define INOTIFY_BUFF_SIZE ((sizeof(struct inotify_event)+FILENAME_MAX)*1024) - class CCrashWatcher //: public CDBusServer_adaptor, // public DBus::IntrospectableAdaptor, @@ -64,6 +63,7 @@ class CCrashWatcher std::string m_sTarget; CMiddleWare *m_pMW; CCommLayerServer *m_pCommLayer; + CCommLayerInner *m_pCommLayerInner; /*FIXME not needed */ //DBus::Connection *m_pConn; CSettings *m_pSettings; diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index ca3a470..84013d4 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -1,8 +1,8 @@ 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../../lib/MiddleWare -I../../lib/CommLayer\ - -I../../lib/DBus -I../../lib/Utils\ +abrt_CPPFLAGS = -Wall -Werror -rdynamic -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)\" \ |