From 2eaefaba3adc33050dca46f6d42d5ca9fc92d28b Mon Sep 17 00:00:00 2001
From: Sala Leonardo <leonardo.sala@psi.ch>
Date: Tue, 18 Nov 2014 10:51:52 +0100
Subject: [PATCH] added log level control

---
 slsReceiverSoftware/Makefile         |  4 ++--
 slsReceiverSoftware/include/logger.h | 17 +++++++++++++----
 slsReceiverSoftware/src/main.cpp     |  4 ----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile
index c16db2438..2a6303f93 100644
--- a/slsReceiverSoftware/Makefile
+++ b/slsReceiverSoftware/Makefile
@@ -45,9 +45,9 @@ intdoc: $(SRC_H) $(SRC_CLNT)
 
 $(BUILDDIR)/%.o : $(SRCDIR)/%.cpp Makefile
 ifeq ($(ROOTSLS),yes)
-	$(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS)  $(ROOTFLAGS) -fPIC  $(EPICSFLAGS) $(LDFLAGRXR) -L/usr/lib64/ #$(FLAGS)
+	$(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS)  $(ROOTFLAGS) -fPIC  $(EPICSFLAGS) $(LDFLAGRXR) -L/usr/lib64/ $(FLAGS)
 else	
-	$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC  $(EPICSFLAGS) $(LDFLAGRXR) -lpthread #$(FLAGS)
+	$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC  $(EPICSFLAGS) $(LDFLAGRXR) -lpthread $(FLAGS)
 endif
 
 lib:  $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a 
diff --git a/slsReceiverSoftware/include/logger.h b/slsReceiverSoftware/include/logger.h
index 74f5c9a12..cba284fb1 100644
--- a/slsReceiverSoftware/include/logger.h
+++ b/slsReceiverSoftware/include/logger.h
@@ -6,6 +6,19 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#ifdef VERBOSE
+#define FILELOG_MAX_LEVEL logDEBUG
+#endif
+
+#ifdef VERYVERBOSE
+#define FILELOG_MAX_LEVEL logDEBUG4
+#endif
+
+#ifndef FILELOG_MAX_LEVEL
+#define FILELOG_MAX_LEVEL logINFO
+#endif
+
+
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
 #define MYCONCAT(x,y)  
@@ -60,10 +73,6 @@ public:
 class FILELOG_DECLSPEC FILELog : public Log<Output2FILE> {};
 //typedef Log<Output2FILE> FILELog;
 
-#ifndef FILELOG_MAX_LEVEL
-#define FILELOG_MAX_LEVEL logDEBUG4
-#endif
-
 #define FILE_LOG(level) \
 	if (level > FILELOG_MAX_LEVEL) ;				\
 	else if (level > FILELog::ReportingLevel() || !Output2FILE::Stream()) ; \
diff --git a/slsReceiverSoftware/src/main.cpp b/slsReceiverSoftware/src/main.cpp
index 32adb96be..c2dde5fc4 100644
--- a/slsReceiverSoftware/src/main.cpp
+++ b/slsReceiverSoftware/src/main.cpp
@@ -13,10 +13,6 @@
 using namespace std;
 
 
-
-
-
-
 int main(int argc, char *argv[]) {
 	int ret = slsReceiverDefs::OK;