From 46f6510bb78a19f862bd3c1ffff6ac322ca6d6b4 Mon Sep 17 00:00:00 2001
From: Dimitar Petrovski <dimeptr@gmail.com>
Date: Tue, 8 May 2012 18:27:16 +0200
Subject: modified logging and added logging to epghandler.c

---
 log.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 log.h

(limited to 'log.h')

diff --git a/log.h b/log.h
new file mode 100644
index 0000000..900aed6
--- /dev/null
+++ b/log.h
@@ -0,0 +1,76 @@
+/*
+ * log.h
+ *
+ *  Created on: 08.5.2012
+ *      Author: d.petrovski
+ */
+
+#ifndef LOG_H_
+#define LOG_H_
+
+#include <string>
+#include <stdarg.h>
+
+#define VERBOSE 1
+/* 0 = only print errors, 1 = print channels and themes, 2 = print channels, themes, titles, summaries 3 = debug mode */
+/* all is logged into /var/log/syslog */
+
+
+bool CheckLevel(int level)
+{
+#ifdef DEBUG
+  if (SetupPE.LogLevel >= level)
+#else
+  if (VERBOSE >= level)
+#endif
+  {
+    return true;
+  }
+  return false;
+}
+
+const char* PrepareLog(std::string message)
+{
+  message = "EEPG: " + message;
+  return message.c_str();
+}
+
+#define MAXSYSLOGBUF 256
+
+//void LogVsyslog(int errLevel, const char * message, ...)
+void LogVsyslog(int errLevel, int const& lineNum, const char * function, const char * message, ...)
+{
+  va_list ap;
+  char fmt[MAXSYSLOGBUF];
+  if (errLevel == LOG_DEBUG) {
+    snprintf(fmt, sizeof(fmt), "[%d] %s:%d %s", cThread::ThreadId(), function, lineNum, message);
+  } else {
+    snprintf(fmt, sizeof(fmt), "[%d] %s", cThread::ThreadId(), message);
+  }
+  va_start(ap,message);
+  vsyslog ( errLevel, fmt, ap );
+  va_end(ap);
+}
+
+#define LogI(a, b...) void( CheckLevel(a) ? LogVsyslog ( LOG_INFO, __LINE__, __FUNCTION__, b ) : void() )
+#define LogE(a, b...) void( CheckLevel(a) ? LogVsyslog ( LOG_ERR, __LINE__, __FUNCTION__, b ) : void() )
+#define LogD(a, b...) void( CheckLevel(a) ? LogVsyslog ( LOG_DEBUG, __LINE__, __FUNCTION__, b ) : void() )
+//#define LogE(a, b...) void( CheckLevel(a) ? esyslog ( b ) : void() )
+//#define LogD(a, b...) void( CheckLevel(a) ? dsyslog ( b ) : void() )
+#define prep(s) PrepareLog(s)
+#define prep2(s) s
+
+
+//void LogF(int level, const char * message, ...)  __attribute__ ((format (printf,2,3)));
+
+//void LogF(int level, const char * message, ...)
+//{
+//  if (CheckLevel(level)) {
+//    va_list ap;
+//    va_start(ap,message);
+//    vsyslog (LOG_ERR, PrepareLog(message), ap );
+//    va_end(ap);
+//  }
+//}
+
+#endif /* LOG_H_ */
-- 
cgit v1.2.3


From 5745ef4a6bfeede40fe69067f51e714718243045 Mon Sep 17 00:00:00 2001
From: Dimitar Petrovski <dimeptr@gmail.com>
Date: Fri, 18 May 2012 09:19:41 +0200
Subject: move cSetupEEPG to separate files

---
 log.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'log.h')

diff --git a/log.h b/log.h
index 900aed6..35942d3 100644
--- a/log.h
+++ b/log.h
@@ -10,16 +10,17 @@
 
 #include <string>
 #include <stdarg.h>
+#include "setupeepg.h"
 
 #define VERBOSE 1
 /* 0 = only print errors, 1 = print channels and themes, 2 = print channels, themes, titles, summaries 3 = debug mode */
 /* all is logged into /var/log/syslog */
 
 
-bool CheckLevel(int level)
+inline bool CheckLevel(int level)
 {
 #ifdef DEBUG
-  if (SetupPE.LogLevel >= level)
+  if (cSetupEEPG::getInstance()->LogLevel >= level)
 #else
   if (VERBOSE >= level)
 #endif
@@ -29,7 +30,7 @@ bool CheckLevel(int level)
   return false;
 }
 
-const char* PrepareLog(std::string message)
+inline const char* PrepareLog(std::string message)
 {
   message = "EEPG: " + message;
   return message.c_str();
@@ -38,7 +39,7 @@ const char* PrepareLog(std::string message)
 #define MAXSYSLOGBUF 256
 
 //void LogVsyslog(int errLevel, const char * message, ...)
-void LogVsyslog(int errLevel, int const& lineNum, const char * function, const char * message, ...)
+inline void LogVsyslog(int errLevel, int const& lineNum, const char * function, const char * message, ...)
 {
   va_list ap;
   char fmt[MAXSYSLOGBUF];
-- 
cgit v1.2.3


From 6810f79e1b5f78a0b3d2389714924738295a6497 Mon Sep 17 00:00:00 2001
From: Dimitar Petrovski <dimeptr@gmail.com>
Date: Thu, 18 Oct 2012 14:32:04 +0200
Subject: fix compile

---
 log.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'log.h')

diff --git a/log.h b/log.h
index 35942d3..b743763 100644
--- a/log.h
+++ b/log.h
@@ -9,7 +9,8 @@
 #define LOG_H_
 
 #include <string>
-#include <stdarg.h>
+#include <vdr/tools.h>
+#include <vdr/thread.h>
 #include "setupeepg.h"
 
 #define VERBOSE 1
-- 
cgit v1.2.3