From 27b395cec3cc34e7836a84bbf5e8886d0d01c0bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Thu, 17 Oct 2013 15:39:58 +0200
Subject: [PATCH] Always enable syslog, new debug() and log() definitions.

---
 src/Vfs.cpp |  3 +--
 src/Vfs.h   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Vfs.cpp b/src/Vfs.cpp
index f79d753..74d6dc6 100644
--- a/src/Vfs.cpp
+++ b/src/Vfs.cpp
@@ -36,9 +36,8 @@ VfsFactory::VfsFactory() throw (DmException)
   struct hostent* hent = gethostbyname(hname.nodename);
   
   this->hostName_ = hent->h_name;
-#ifdef DEBUG
+
   openlog("dmlite-vfs-plugin", LOG_PID, LOG_USER);
-#endif
 }
 
 
diff --git a/src/Vfs.h b/src/Vfs.h
index 1f938b2..c36a0aa 100644
--- a/src/Vfs.h
+++ b/src/Vfs.h
@@ -4,28 +4,34 @@
 #ifndef VFS_H
 #define	VFS_H
 
+#include <syslog.h>
 #include <dmlite/cpp/authn.h>
 #include <dmlite/cpp/catalog.h>
 #include <dmlite/cpp/dmlite.h>
 #include <dmlite/cpp/io.h>
 #include <dmlite/cpp/poolmanager.h>
 
+
 #ifdef DEBUG
-#include <syslog.h>
+  #ifdef __GNUC__
+    #define debug(MSG, ARGS...) syslog(LOG_DEBUG, "%s::%s(): " MSG, getImplId().c_str(), __func__, ##ARGS)
+  #else
+    #define debug(MSG, ...) syslog(LOG_DEBUG, "%s::%s(): " MSG, getImplId().c_str(), __func__ , ##__VA_ARGS)
+  #endif
 #else
-#define syslog
-#define LOG_DEBUG 0
+  #define debug
 #endif
 
-
 #ifdef __GNUC__
   #define vfsThrowErrno(MSG...) dmlite::vfsThrowHelper(getImplId(), __func__, DMLITE_SYSERR(errno) , ##MSG)
   #define vfsThrow(CODE, MSG...) dmlite::vfsThrowHelper(getImplId(), __func__, (CODE) , ##MSG)
   #define wrapCall(RETVAL, MSG...) dmlite::vfsWrapCallHelper(getImplId(), __func__, (RETVAL) , ##MSG)
+  #define log(LEVEL, MSG, ARGS...) syslog((LEVEL), "%s::%s(): " MSG, getImplId().c_str(), __func__ , ##ARGS)
 #else
   #define vfsThrowErrno(MSG, ...) dmlite::vfsThrowHelper(getImplId(), __func__, DMLITE_SYSERR(errno), (MSG) , ##__VA_ARGS__)
   #define vfsThrow(CODE, MSG, ...) dmlite::vfsThrowHelper(getImplId(), __func__, (CODE), (MSG) , ##__VA_ARGS__)
   #define wrapCall(RETVAL, ...) dmlite::vfsWrapCallHelper(getImplId(), __func__, (RETVAL) , ##__VA_ARGS__)
+  #define log(LEVEL, MSG, ...) syslog((LEVEL), "%s::%s(): " MSG, getImplId().c_str(), __func__ , ##__VA_ARGS)
 #endif
 
 namespace dmlite {
-- 
1.8.2.3