X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=678b5686c2ffad0dd7c6d8955b6712dc8e22d647;hb=730ce301477d9d5c9367756bad840eb4504e0257;hp=dd7c90cac69e681ac8b4cf656198766c2cc0091d;hpb=8db64b0eebeaa80e46b2df40b91af741e533e7bc;p=tlsproxy%2Ftlsproxy.git

diff --git a/src/log.c b/src/log.c
index dd7c90c..678b568 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,7 +1,7 @@
 /*
  * Log related functions/defines.
  *
- * Copyright (C) 2011  Simon Ruderich
+ * Copyright (C) 2011-2013  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,13 +20,11 @@
 #include "tlsproxy.h"
 #include "log.h"
 
-/* va_*() */
-#include <stdarg.h>
-/* pthread_*() */
 #include <pthread.h>
+#include <stdarg.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,15 +33,30 @@ 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_DEBUG1_LEVEL:  level_string = "DEBUG1"; break;
+        case LOG_DEBUG2_LEVEL:  level_string = "DEBUG2"; break;
+        default:                level_string = "UNKNOWN";
     }
 
+#ifndef DEBUG
+    /* Prevent warnings. */
+    (void)file;
+    (void)line;
+#endif
+
+    /* Prevent another thread from interrupting the printfs(). */
+    flockfile(stderr);
+
+#ifdef DEBUG
+    fprintf(stderr, "%-12s:%-4d ", file, line);
+#endif
+    fprintf(stderr, "[%s] [%ld] ", level_string, (long)pthread_self());
     va_start(ap, format);
-    fprintf(stdout, "[%s] [%d] ", level_string, (int)pthread_self());
-    vfprintf(stdout, format, ap);
-    fprintf(stdout, "\n");
+    vfprintf(stderr, format, ap);
     va_end(ap);
+    fprintf(stderr, "\n");
+
+    funlockfile(stderr);
 }