X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=402e82dbdf0472e18c78b2c08fffeb00accbbe3f;hb=412b6491a940ba3de97e5be95bd35197e51ee210;hp=05acddfc8b98b5d8fcb37f89f1974b47d32c59b1;hpb=193405f1f065a4b1cb6c0a136a9e5965f13993d7;p=tlsproxy%2Ftlsproxy.git diff --git a/src/log.c b/src/log.c index 05acddf..402e82d 100644 --- a/src/log.c +++ b/src/log.c @@ -33,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"; } @@ -45,22 +46,17 @@ void log_message(int level, const char *file, int line, const char *format, ...) (void)line; #endif - /* Prevent another thread from interrupting the two printfs(). */ - flockfile(stdout); + /* Prevent another thread from interrupting the printfs(). */ + flockfile(stderr); - fprintf(stdout, #ifdef DEBUG - "%-12s:%-3d " + fprintf(stderr, "%-12s:%-4d ", file, line); #endif - "[%s] [%d] ", -#ifdef DEBUG - file, line, -#endif - level_string, (int)pthread_self()); + fprintf(stderr, "[%s] [%d] ", level_string, (int)pthread_self()); va_start(ap, format); - vfprintf(stdout, format, ap); + vfprintf(stderr, format, ap); va_end(ap); - fprintf(stdout, "\n"); + fprintf(stderr, "\n"); - funlockfile(stdout); + funlockfile(stderr); }