Changeset 378 for cpp/frams/loggers/loggers.h

Timestamp:

04/27/15 04:44:23 (9 years ago)

Author:

Maciej Komosinski

Message:

Improved argument variable names; changed implementation to use STL classes (vector, string)

File:

• cpp/frams/loggers/loggers.h (modified) (8 diffs)

cpp/frams/loggers/loggers.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _FRAMS_LOGGERS_H_
-#define _FRAMS_LOGGERS_H_
+#ifndef _COMMON_LOGGERS_H_
+#define _COMMON_LOGGERS_H_
 
-#include <frams/util/list.h>
-#include <frams/util/sstring.h>
 #include <common/log.h>
 #include <common/threads.h>
+#include <common/nonstd_stl.h>
 
 class LoggerBase;
@@ -16 +15 @@
 {
         friend class LoggerBase;
-        SListTempl<LoggerBase*> handlers;
-        void send(int level, const char *o, const char *m, int w, const char *bl);
+        vector<LoggerBase*> loggers;
+        void send(int position, const char *obj, const char *method, int level, const char *msg);
 public:
-        int find(LoggerBase *r) { return handlers.find(r); }
-        int add(LoggerBase *r);
+        int find(LoggerBase *logger)
+        {
+                vector<LoggerBase*>::iterator it = std::find(loggers.begin(), loggers.end(), logger);
+                return it == loggers.end() ? -1 : std::distance(loggers.begin(), it);
+        }
+        int add(LoggerBase *logger);
         void remove(int i);
-        void remove(LoggerBase *r);
+        void remove(LoggerBase *logger);
         void removeAll();
-        void send(const char *o, const char *m, int w, const char *bl)
+        void send(const char *obj, const char *method, int level, const char *msg)
         {
-                send(handlers.size() - 1, o, m, w, bl);
+                send(loggers.size() - 1, obj, method, level, msg);
         }
         ~LoggerManager() { removeAll(); }
@@ -50 +53 @@
 
         void logPrintf(const char *o, const char *m, int w, const char *bl, ...);
-        void send(const char *o, const char *m, int w, const char *bl);
+        void send(const char *obj, const char *method, int level, const char *msg);
 
         bool isEnabled() { return manager ? true : false; }
@@ -68 +71 @@
         }
 
-        virtual void handle(const char *o, const char *m, int w, const char *bl) {}
+        virtual void handle(const char *obj, const char *method, int level, const char *msg) {}
 };
 
@@ -76 +79 @@
 {
 protected:
-        int maxlevel, minleveltostore, errcount, warncount, storedcount, infocount;
-        SString msgs;
+        int maxlevel, minleveltostore, errcount, warncount, infocount, storedcount;
+        string msgs;
 
 public:
 
-        void reset() { maxlevel = LOG_INFO - 1; errcount = warncount = storedcount = infocount = 0; msgs = 0; }
+        void reset() { maxlevel = LOG_INFO - 1; errcount = warncount = infocount = storedcount = 0; msgs = ""; }
 
         enum Options2
@@ -93 +96 @@
         int getStoredCount()      { return storedcount; }
         int getErrorLevel()       { return maxlevel; }
-        const SString& getMessages() { return msgs; }
+        const string getMessages() { return msgs; }
 
         LoggerToMemory(int opts = 0, int minimal_level_to_store = LOG_ERROR) :LoggerBase(opts), minleveltostore(minimal_level_to_store)
@@ -100 +103 @@
         }
 
-        void handle(const char *o, const char *m, int w, const char *bl);
+        void handle(const char *obj, const char *method, int level, const char *msg);
 };
 
@@ -107 +110 @@
         LoggerManager *other_manager;
 public:
-        RedirectingLogger(LoggerManager *other_mgr,int opts=0)
+        RedirectingLogger(LoggerManager *other_mgr, int opts = 0)
                 :LoggerBase(opts), other_manager(other_mgr) {}
 
-        void handle(const char *o, const char *m, int w, const char *bl)
+        void handle(const char *obj, const char *method, int level, const char *msg)
         {
-                other_manager->send(o, m, w, bl);
+                other_manager->send(obj, method, level, msg);
         }
 };