From ec86bc0345e0f5a7a9dbc12c13fc9b8e50b9d4e5 Mon Sep 17 00:00:00 2001
From: ps <ps@805f7146-951d-0410-87ab-a7c6d0b5165e>
Date: Mon, 27 Jun 2011 11:18:42 +0000
Subject: [PATCH] fix a small logging issue

---
 src/FileLogger.cpp |  2 +-
 src/Logger.h       | 10 +++++-----
 src/hermes.h       |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/FileLogger.cpp b/src/FileLogger.cpp
index c244e5f..87943c3 100644
--- a/src/FileLogger.cpp
+++ b/src/FileLogger.cpp
@@ -77,7 +77,7 @@ void FileLogger::addMessage(string file,int line,int loglevel,string logmessage)
   if(cfg.getLogRotationFrequency()>0&&last_rotation+(cfg.getLogRotationFrequency()*60)<time(NULL))
   {
     rotateLog();
-    addMessage(__FILE__,__LINE__,LOG_DEBUG,"Rotated log to file " + getProcessedRotateFilename() + " at " + Utils::ulongtostr(time(NULL)) + " with a last rotation of " + Utils::ulongtostr(last_rotation));
+    addMessage(__FILE__,__LINE__,HERMES_LOG_DEBUG,"Rotated log to file " + getProcessedRotateFilename() + " at " + Utils::ulongtostr(time(NULL)) + " with a last rotation of " + Utils::ulongtostr(last_rotation));
   }
   try
   {
diff --git a/src/Logger.h b/src/Logger.h
index 34491c0..3b7a99d 100644
--- a/src/Logger.h
+++ b/src/Logger.h
@@ -38,11 +38,11 @@ class Logger
 #include "UnixLogger.h"
 #endif //WIN32
 
-#ifndef LOG_INFO
-#define LOG_ERR 0
-#define LOG_INFO 1
-#define LOG_DEBUG 2
-#endif //LOG_INFO
+#ifndef HERMES_LOG_INFO
+#define HERMES_LOG_ERR 0
+#define HERMES_LOG_INFO 1
+#define HERMES_LOG_DEBUG 2
+#endif //HERMES_LOG_INFO
 #include "FileLogger.h"
 #include "NullLogger.h"
 
diff --git a/src/hermes.h b/src/hermes.h
index 58b669b..ce23186 100644
--- a/src/hermes.h
+++ b/src/hermes.h
@@ -27,9 +27,9 @@
 
 #define _(x) (x)
 #define LOG(x,y) hermes_log.addMessage(__FILE__,__LINE__,x,y)
-#define LERR(x) LOG(LOG_ERR,x)
-#define LINF(x) LOG(LOG_INFO,x)
-#define LDEB(x) LOG(LOG_DEBUG,x)
+#define LERR(x) LOG(HERMES_LOG_ERR,x)
+#define LINF(x) LOG(HERMES_LOG_INFO,x)
+#define LDEB(x) LOG(HERMES_LOG_DEBUG,x)
 
 
 typedef struct