From c64f91baf599133f88658e7a45a4d7e4a6c43d2b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 7 Aug 2009 18:13:23 +0200 Subject: simplify logging by removing CCommLayerInner class It had single use site. The class itself is trivial, it just passed messages down to an CObserver. Now we pass messages directly to an CObserver. Signed-off-by: Denys Vlasenko --- src/Daemon/CrashWatcher.cpp | 4 +--- src/Daemon/CrashWatcher.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Daemon') diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index c64e22a..1ad5998 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -450,8 +450,7 @@ CCrashWatcher::CCrashWatcher(const std::string& pPath) // TODO: initialize object according parameters -w -d // status has to be always created. m_pCommLayer = NULL; - m_pCommLayerInner = new CCommLayerInner(this, true, true); - comm_layer_inner_init(m_pCommLayerInner); + comm_layer_inner_init(this); m_pSettings = new CSettings(); m_pSettings->LoadSettings(std::string(CONF_DIR) + "/abrt.conf"); @@ -506,7 +505,6 @@ CCrashWatcher::~CCrashWatcher() delete m_pCommLayer; delete m_pMW; delete m_pSettings; - delete m_pCommLayerInner; if (pthread_mutex_destroy(&m_pJobsMutex) != 0) { throw CABRTException(EXCEP_FATAL, "CCrashWatcher::CCrashWatcher(): Can't destroy mutex!"); diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h index 1d91c9b..1ad9d4e 100644 --- a/src/Daemon/CrashWatcher.h +++ b/src/Daemon/CrashWatcher.h @@ -111,7 +111,6 @@ 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; -- cgit