Implement cleaner logging approach.

[tlsproxy/tlsproxy.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index dd7c90cac69e681ac8b4cf656198766c2cc0091d..a703c1cc536b283d143227adb2bdae071374ded7 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -26,7 +26,7 @@
 #include <pthread.h>
 
 
-void log_message(int level, const char *format, ...) {
+void log_message(int level, const char *file, int line, const char *format, ...) {
     va_list ap;
     const char *level_string;
 
@@ -35,13 +35,19 @@ void log_message(int level, const char *format, ...) {
     }
 
     switch (level) {
-        case LOG_ERROR:   level_string = "ERROR"; break;
-        case LOG_WARNING: level_string = "WARN "; break;
-        case LOG_DEBUG:   level_string = "DEBUG"; break;
-        default:          level_string = "UNKNOWN";
+        case LOG_ERROR_LEVEL:   level_string = "ERROR"; break;
+        case LOG_WARNING_LEVEL: level_string = "WARN "; break;
+        case LOG_DEBUG_LEVEL:   level_string = "DEBUG"; break;
+        default:                level_string = "UNKNOWN";
     }
 
     va_start(ap, format);
+#if DEBUG
+    fprintf(stdout, "%-12s:%-3d ", file, line);
+#else
+    (void)file;
+    (void)line;
+#endif
     fprintf(stdout, "[%s] [%d] ", level_string, (int)pthread_self());
     vfprintf(stdout, format, ap);
     fprintf(stdout, "\n");