Changeset 675

Timestamp:

10/23/06 19:01:53 (2 years ago)

Author:

common

Message:

nepenthes

• LogManager?, added bool LogManager::delLogger(LogHandler? *lh), return true on success, false else
  
• log-irc, use LogManager::delLogger(LogHandler? *lh) on ::Exit()
  

Files:

• nepenthes/trunk/modules/log-irc/log-irc.cpp (modified) (1 diff)
• nepenthes/trunk/nepenthes-core/include/LogManager.hpp (modified) (1 diff)
• nepenthes/trunk/nepenthes-core/src/LogManager.cpp (modified) (1 diff)

nepenthes/trunk/modules/log-irc/log-irc.cpp

@@ -232 +232 @@
-bool LogIrc::Exit()
-{
+        if (g_Nepenthes->getLogMgr()->delLogger(this) == true)
+        {
+                logDebug("Unregisterd from logmanager\n");
+        }else
+        {
+                logWarn("Could not unregister from logmanager\n");
+        }
-        return true;
-}

nepenthes/trunk/nepenthes-core/include/LogManager.hpp

@@ -56 +56 @@
-                void                            registerTag(uint32_t bit, const char *tag);
-                virtual void            addLogger(LogHandler *lh, uint32_t filterMask);
+                virtual bool            delLogger(LogHandler *lh);
-                virtual void            log(uint32_t mask, const char *message);
-                virtual void            logf(uint32_t mask, const char *format, ...);

nepenthes/trunk/nepenthes-core/src/LogManager.cpp

@@ -122 +122 @@
-}
-
+bool LogManager::delLogger(LogHandler *lh)
+{
+        list<LogHandlerEntry *>::iterator it;
+        for( it = m_Loggers.begin(); it != m_Loggers.end(); it++ )
+        {
+                if ((*it)->m_Lh == lh)
+                {
+                m_Loggers.erase(it);
+                        delete *it;
+                        return true;
+                }
+        }
+        return false;
+}
-
-/**