X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=4dc53f78124b08c621abd33f8123b31fa7e77309;hb=f3ca90e517a9ae54e831e5a5b91fcc2afb9df5bf;hp=4a3407b0d2f96e590d7685b083e503731b6742bc;hpb=948878cf1d882adef61f9bd7c26473089f3032ad;p=tlsproxy%2Ftlsproxy.git

diff --git a/src/log.c b/src/log.c
index 4a3407b..4dc53f7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,7 +1,7 @@
 /*
  * Log related functions/defines.
  *
- * Copyright (C) 2011-2012  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,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, ...) {
@@ -37,19 +35,32 @@ 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_DEBUG1_LEVEL:  level_string = "DEBUG"; break;
         default:                level_string = "UNKNOWN";
     }
 
-    va_start(ap, format);
-#ifdef DEBUG
-    fprintf(stdout, "%-12s:%-3d ", file, line);
-#else
+#ifndef DEBUG
+    /* Prevent warnings. */
     (void)file;
     (void)line;
 #endif
-    fprintf(stdout, "[%s] [%d] ", level_string, (int)pthread_self());
-    vfprintf(stdout, format, ap);
-    fprintf(stdout, "\n");
+
+    /* Prevent another thread from interrupting the two printfs(). */
+    flockfile(stderr);
+
+    fprintf(stderr,
+#ifdef DEBUG
+            "%-12s:%-3d "
+#endif
+            "[%s] [%d] ",
+#ifdef DEBUG
+            file, line,
+#endif
+            level_string, (int)pthread_self());
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
     va_end(ap);
+    fprintf(stderr, "\n");
+
+    funlockfile(stderr);
 }