don't engage logging system if log level is too low

Change-Id: I3d54da1b587637119f3e4de92e50d029274204a7

daemon/log.h

@@ -42,7 +42,6 @@ void cdrlog(const char* cdrbuffer);
 void rtcplog(const char* cdrbuffer);
 
 
-#define ilog(...) __ilog(__VA_ARGS__)
 void __ilog(int prio, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 
 

lib/loglib.c

@@ -181,7 +181,7 @@ void __vpilog(int prio, const char *prefix, const char *fmt, va_list ap) {
 	piece = msg;
 
 	while (max_log_line_length && ret > max_log_line_length) {
-		write_log(xprio, "%s%s%.*s ...", prefix, infix, max_log_line_length, piece);
+		write_log(xprio, "%s: %s%s%.*s ...", prio_prefix, prefix, infix, max_log_line_length, piece);
 		ret -= max_log_line_length;
 		piece += max_log_line_length;
 		infix = "... ";

lib/loglib.h

@@ -36,17 +36,17 @@ void __ilog_np(int prio, const char *format, ...) __attribute__ ((format (printf
 
 
 #ifndef __DEBUG
-#define pilog(prio, fmt...)									\
+#define ilog(prio, fmt, ...)									\
 	do {											\
 		int loglevel = get_log_level();							\
 		if (LOG_LEVEL_MASK((prio)) > LOG_LEVEL_MASK(loglevel))				\
 			break;									\
 		if ((loglevel & LOG_FLAG_RESTORE) && !((prio) & LOG_FLAG_RESTORE))		\
 			break;									\
-		__ilog(prio, fmt);								\
+		__ilog(prio, fmt, ##__VA_ARGS__);						\
 	} while (0)
 #else
-#define pilog(prio, fmt...) __ilog(prio, fmt)
+#define ilog(prio, fmt, ...) __ilog(prio, fmt, ##__VA_ARGS__)
 #endif
 
 

recording-daemon/log.h

@@ -10,7 +10,7 @@
 
 #define die(fmt, ...) do { ilog(LOG_CRIT, "Fatal error: " fmt, ##__VA_ARGS__); exit(-1); } while (0)
 #define die_errno(msg) die("%s: %s", msg, strerror(errno))
-#define ilog(...) __ilog_np(__VA_ARGS__)
+#define __ilog(...) __ilog_np(__VA_ARGS__)
 #define dbg(fmt, ...) ilog(LOG_DEBUG, fmt, ##__VA_ARGS__)
 
 #endif