X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=402e82dbdf0472e18c78b2c08fffeb00accbbe3f;hb=9f7ef8fa5c5216ac2510d2b4acb3b1b5c26886d1;hp=e00a08d8aa77f9a2914ce39fee3821c97bd87e97;hpb=a64101800c79c852cc4ab9d445c35aad0a6457eb;p=tlsproxy%2Ftlsproxy.git

diff --git a/src/log.c b/src/log.c
index e00a08d..402e82d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -20,10 +20,8 @@
 #include "tlsproxy.h"
 #include "log.h"
 
-/* va_*() */
-#include <stdarg.h>
-/* pthread_self() */
 #include <pthread.h>
+#include <stdarg.h>
 
 
 void log_message(int level, const char *file, int line, const char *format, ...) {
@@ -35,9 +33,10 @@ void log_message(int level, const char *file, int line, const char *format, ...)
     }
 
     switch (level) {
-        case LOG_ERROR_LEVEL:   level_string = "ERROR"; break;
-        case LOG_WARNING_LEVEL: level_string = "WARN "; break;
-        case LOG_DEBUG_LEVEL:   level_string = "DEBUG"; break;
+        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";
     }
 
@@ -47,17 +46,17 @@ void log_message(int level, const char *file, int line, const char *format, ...)
     (void)line;
 #endif
 
-    va_start(ap, format);
-    fprintf(stdout,
-#ifdef DEBUG
-            "%-12s:%-3d "
-#endif
-            "[%s] [%d] ",
+    /* Prevent another thread from interrupting the printfs(). */
+    flockfile(stderr);
+
 #ifdef DEBUG
-            file, line,
+    fprintf(stderr, "%-12s:%-4d ", file, line);
 #endif
-            level_string, (int)pthread_self());
-    vfprintf(stdout, format, ap);
-    fprintf(stdout, "\n");
+    fprintf(stderr, "[%s] [%d] ", level_string, (int)pthread_self());
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
     va_end(ap);
+    fprintf(stderr, "\n");
+
+    funlockfile(stderr);
 }