Rename log

This commit is contained in:
2026-06-26 15:59:17 +01:00
parent 28f95b1d41
commit cd797683d2
2 changed files with 47 additions and 47 deletions
+31 -31
View File
@@ -24,80 +24,80 @@ typedef struct {
} LogConfig;
wp_intern LogConfig LOG_CONFIG = {
.level = WAPP_LOG_DEBUG,
.level = WP_LOG_LEVEL_DEBUG,
};
wp_intern Str8RO LOG_LEVEL_STRINGS[COUNT_LOG_LEVEL] = {
[WAPP_LOG_FATAL] = wapp_str8_lit_ro_initialiser_list("fatal "),
[WAPP_LOG_CRITICAL] = wapp_str8_lit_ro_initialiser_list("critical "),
[WAPP_LOG_ERROR] = wapp_str8_lit_ro_initialiser_list("error "),
[WAPP_LOG_WARNING] = wapp_str8_lit_ro_initialiser_list("warning "),
[WAPP_LOG_INFO] = wapp_str8_lit_ro_initialiser_list("info "),
[WAPP_LOG_DEBUG] = wapp_str8_lit_ro_initialiser_list("debug "),
[WP_LOG_LEVEL_FATAL] = wapp_str8_lit_ro_initialiser_list("fatal "),
[WP_LOG_LEVEL_CRITICAL] = wapp_str8_lit_ro_initialiser_list("critical "),
[WP_LOG_LEVEL_ERROR] = wapp_str8_lit_ro_initialiser_list("error "),
[WP_LOG_LEVEL_WARNING] = wapp_str8_lit_ro_initialiser_list("warning "),
[WP_LOG_LEVEL_INFO] = wapp_str8_lit_ro_initialiser_list("info "),
[WP_LOG_LEVEL_DEBUG] = wapp_str8_lit_ro_initialiser_list("debug "),
};
wp_intern void _get_current_time_string(Str8 *dst);
wp_intern void _write_log_line(WFile *fp, const Logger *logger, Str8 msg, LogLevel level);
wp_intern void _write_log_line(WFile *fp, const WpLogger *logger, Str8 msg, LogLevel level);
void wapp_log_set_level(LogLevel level) {
void wpLogSetLevel(LogLevel level) {
LOG_CONFIG.level = level;
}
void wapp_log_configure(WFile *outlog, WFile *errlog, LogLevel level) {
void wpLogConfigure(WFile *outlog, WFile *errlog, LogLevel level) {
LOG_CONFIG.outlog = outlog;
LOG_CONFIG.errlog = errlog;
LOG_CONFIG.level = level;
}
Logger wapp_log_make_logger(Str8 name) {
return (Logger){ .name = name };
WpLogger wpLogMakeLogger(Str8 name) {
return (WpLogger){ .name = name };
}
void wapp_log_debug(const Logger *logger, Str8 msg) {
void wpLogDebug(const WpLogger *logger, Str8 msg) {
wpDebugAssert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_DEBUG) { return; }
if (LOG_CONFIG.level < WP_LOG_LEVEL_DEBUG) { return; }
WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
_write_log_line(fp, logger, msg, WAPP_LOG_DEBUG);
_write_log_line(fp, logger, msg, WP_LOG_LEVEL_DEBUG);
}
void wapp_log_info(const Logger *logger, Str8 msg) {
void wpLogInfo(const WpLogger *logger, Str8 msg) {
wpDebugAssert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_INFO) { return; }
if (LOG_CONFIG.level < WP_LOG_LEVEL_INFO) { return; }
WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
_write_log_line(fp, logger, msg, WAPP_LOG_INFO);
_write_log_line(fp, logger, msg, WP_LOG_LEVEL_INFO);
}
void wapp_log_warning(const Logger *logger, Str8 msg) {
void wpLogWarning(const WpLogger *logger, Str8 msg) {
wpDebugAssert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_WARNING) { return; }
if (LOG_CONFIG.level < WP_LOG_LEVEL_WARNING) { return; }
WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
_write_log_line(fp, logger, msg, WAPP_LOG_WARNING);
_write_log_line(fp, logger, msg, WP_LOG_LEVEL_WARNING);
}
void wapp_log_error(const Logger *logger, Str8 msg) {
void wpLogError(const WpLogger *logger, Str8 msg) {
wpDebugAssert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_ERROR) { return; }
if (LOG_CONFIG.level < WP_LOG_LEVEL_ERROR) { return; }
WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
_write_log_line(fp, logger, msg, WAPP_LOG_ERROR);
_write_log_line(fp, logger, msg, WP_LOG_LEVEL_ERROR);
}
void wapp_log_critical(const Logger *logger, Str8 msg) {
void wpLogCritical(const WpLogger *logger, Str8 msg) {
wpDebugAssert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_CRITICAL) { return; }
if (LOG_CONFIG.level < WP_LOG_LEVEL_CRITICAL) { return; }
WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
_write_log_line(fp, logger, msg, WAPP_LOG_CRITICAL);
_write_log_line(fp, logger, msg, WP_LOG_LEVEL_CRITICAL);
}
void wapp_log_fatal(const Logger *logger, Str8 msg) {
void wpLogFatal(const WpLogger *logger, Str8 msg) {
wpDebugAssert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_FATAL) { return; }
if (LOG_CONFIG.level < WP_LOG_LEVEL_FATAL) { return; }
WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
_write_log_line(fp, logger, msg, WAPP_LOG_FATAL);
_write_log_line(fp, logger, msg, WP_LOG_LEVEL_FATAL);
}
wp_intern void _get_current_time_string(Str8 *dst) {
@@ -110,7 +110,7 @@ wp_intern void _get_current_time_string(Str8 *dst) {
wapp_str8_copy_cstr_capped(dst, buf);
}
wp_intern void _write_log_line(WFile *fp, const Logger *logger, Str8 msg, LogLevel level) {
wp_intern void _write_log_line(WFile *fp, const WpLogger *logger, Str8 msg, LogLevel level) {
Str8 padding = wapp_str8_buf(MIN_LOG_MSG_LENGTH);
u32 padding_size = msg.size < MIN_LOG_MSG_LENGTH ? MIN_LOG_MSG_LENGTH - msg.size + 1 : 0;
wapp_str8_format(&padding, "%-*s", padding_size, " ");
+16 -16
View File
@@ -7,28 +7,28 @@
#include "../base/strings/str8/str8.h"
typedef enum {
WAPP_LOG_FATAL,
WAPP_LOG_CRITICAL,
WAPP_LOG_ERROR,
WAPP_LOG_WARNING,
WAPP_LOG_INFO,
WAPP_LOG_DEBUG,
WP_LOG_LEVEL_FATAL,
WP_LOG_LEVEL_CRITICAL,
WP_LOG_LEVEL_ERROR,
WP_LOG_LEVEL_WARNING,
WP_LOG_LEVEL_INFO,
WP_LOG_LEVEL_DEBUG,
COUNT_LOG_LEVEL,
} LogLevel;
typedef struct {
Str8 name;
} Logger;
} WpLogger;
void wapp_log_set_level(LogLevel level);
void wapp_log_configure(WFile *outlog, WFile *errlog, LogLevel level);
Logger wapp_log_make_logger(Str8 name);
void wapp_log_debug(const Logger *logger, Str8 msg);
void wapp_log_info(const Logger *logger, Str8 msg);
void wapp_log_warning(const Logger *logger, Str8 msg);
void wapp_log_error(const Logger *logger, Str8 msg);
void wapp_log_critical(const Logger *logger, Str8 msg);
void wapp_log_fatal(const Logger *logger, Str8 msg);
void wpLogSetLevel(LogLevel level);
void wpLogConfigure(WFile *outlog, WFile *errlog, LogLevel level);
WpLogger wpLogMakeLogger(Str8 name);
void wpLogDebug(const WpLogger *logger, Str8 msg);
void wpLogInfo(const WpLogger *logger, Str8 msg);
void wpLogWarning(const WpLogger *logger, Str8 msg);
void wpLogError(const WpLogger *logger, Str8 msg);
void wpLogCritical(const WpLogger *logger, Str8 msg);
void wpLogFatal(const WpLogger *logger, Str8 msg);
#endif // !LOG_H