TapTap
87585e9881
output_escape() was called on every send_str/receive_str even when LOG_DEBUG_PROTO logging was disabled, allocating and scanning the whole payload for a line that log_debug_message() then discarded. Add a log_debug_enabled(flag) gate mirroring log_debug_message()'s own filter and check it before escaping. Redacted (secret) strings still log the same <redacted> marker; no observable log output changes.
145 lines
3.5 KiB
C
145 lines
3.5 KiB
C
#include "log.h"
|
|
#include <errno.h>
|
|
#include <stdbool.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
static const char* log_level_strings[] = {"DEBUG", "INFO", "WARN", "ERROR"};
|
|
static LogLevel current_log_level = LOG_LEVEL_WARNING;
|
|
static uint32_t current_debug_flags = 0;
|
|
static uint32_t info_flags = 0;
|
|
static bool info_flags_explicit = false;
|
|
static FILE* log_fp = NULL;
|
|
static _Thread_local bool eight_bit_output;
|
|
static LogStderrMode stderr_mode = LOG_STDERR_ERRORS;
|
|
|
|
void set_log_level(LogLevel level) {
|
|
current_log_level = level;
|
|
}
|
|
|
|
void set_log_debug_flags(uint32_t flags) {
|
|
current_debug_flags = flags;
|
|
}
|
|
|
|
uint32_t get_log_debug_flags(void) {
|
|
return current_debug_flags;
|
|
}
|
|
|
|
bool log_debug_enabled(LogDebugFlag flag) {
|
|
return current_log_level <= LOG_LEVEL_DEBUG && (current_debug_flags & flag) != 0;
|
|
}
|
|
|
|
void set_log_info_flags(uint32_t flags) {
|
|
info_flags = flags;
|
|
info_flags_explicit = true;
|
|
}
|
|
|
|
uint32_t get_log_info_flags(void) {
|
|
return info_flags;
|
|
}
|
|
|
|
void log_set_file(FILE* fp) {
|
|
log_fp = fp;
|
|
}
|
|
|
|
void log_set_8_bit_output(bool enabled) {
|
|
eight_bit_output = enabled;
|
|
}
|
|
|
|
bool log_get_8_bit_output(void) {
|
|
return eight_bit_output;
|
|
}
|
|
|
|
void log_set_stderr_mode(LogStderrMode mode) {
|
|
stderr_mode = mode;
|
|
}
|
|
|
|
LogStderrMode log_get_stderr_mode(void) {
|
|
return stderr_mode;
|
|
}
|
|
|
|
static inline void write_message(FILE* dest_io, LogLevel log_level, struct tm t, const char* format,
|
|
va_list args) {
|
|
fprintf(dest_io, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t.tm_year + 1900, t.tm_mon + 1,
|
|
t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, log_level_strings[log_level]);
|
|
|
|
vfprintf(dest_io, format, args);
|
|
fprintf(dest_io, "\n");
|
|
}
|
|
|
|
void log_message(LogLevel log_level, const char* format, ...) {
|
|
if (log_level < current_log_level)
|
|
return;
|
|
if (log_level < 0 || log_level >= (int)(sizeof(log_level_strings) / sizeof(log_level_strings[0])))
|
|
return;
|
|
time_t now = time(NULL);
|
|
struct tm t;
|
|
if (!localtime_r(&now, &t))
|
|
return;
|
|
|
|
FILE* dest_io = stdout;
|
|
if (stderr_mode == LOG_STDERR_ALL || log_level == LOG_LEVEL_ERROR) {
|
|
dest_io = stderr;
|
|
}
|
|
|
|
va_list args;
|
|
va_start(args, format);
|
|
write_message(dest_io, log_level, t, format, args);
|
|
va_end(args);
|
|
|
|
if (log_fp) {
|
|
va_start(args, format);
|
|
write_message(log_fp, log_level, t, format, args);
|
|
va_end(args);
|
|
}
|
|
}
|
|
|
|
void log_debug_message(LogDebugFlag flag, const char* format, ...) {
|
|
if (current_log_level > LOG_LEVEL_DEBUG || !(current_debug_flags & flag))
|
|
return;
|
|
|
|
time_t now = time(NULL);
|
|
struct tm t;
|
|
if (!localtime_r(&now, &t))
|
|
return;
|
|
|
|
va_list args;
|
|
va_start(args, format);
|
|
write_message(stdout, LOG_LEVEL_DEBUG, t, format, args);
|
|
va_end(args);
|
|
|
|
if (log_fp) {
|
|
va_start(args, format);
|
|
write_message(log_fp, LOG_LEVEL_DEBUG, t, format, args);
|
|
va_end(args);
|
|
}
|
|
}
|
|
|
|
void log_info_message(LogInfoFlag flag, const char* format, ...) {
|
|
if ((info_flags_explicit && (info_flags & flag) == 0) ||
|
|
(!info_flags_explicit && current_log_level > LOG_LEVEL_DEBUG))
|
|
return;
|
|
|
|
time_t now = time(NULL);
|
|
struct tm t;
|
|
if (!localtime_r(&now, &t))
|
|
return;
|
|
|
|
va_list args;
|
|
va_start(args, format);
|
|
write_message(stdout, LOG_LEVEL_INFO, t, format, args);
|
|
va_end(args);
|
|
|
|
if (log_fp) {
|
|
va_start(args, format);
|
|
write_message(log_fp, LOG_LEVEL_INFO, t, format, args);
|
|
va_end(args);
|
|
}
|
|
}
|
|
|
|
void log_perror(const char* context) {
|
|
log_message(LOG_LEVEL_ERROR, "%s: %s", context, strerror(errno));
|
|
}
|