Hookup raylib logger to engine logging

This commit is contained in:
2023-11-07 18:01:23 +01:00
parent 2d07a9f3aa
commit e66b313765
3 changed files with 67 additions and 21 deletions

View File

@@ -46,7 +46,7 @@ static const char *LEVEL_STRINGS[] = {
"TRACE",
"DEBUG",
"INFO",
"WARN",
"WARNING",
"ERROR",
"FATAL"
};
@@ -60,9 +60,13 @@ static const char *LEVEL_COLORS[] = {
};
static void bzLoggerStdOutCallback(BzLoggerEvent *ev) {
va_list *ap = ev->apList;
fprintf(stderr, "%s %s%-5s\x1b[0m \x1b[90m%s:%d:\x1b[0m ",
ev->time, LEVEL_STRINGS[ev->level], LEVEL_COLORS[ev->level], ev->file, ev->line);
va_list *ap = ev->vaList;
fprintf(stderr, "%s %s%-5s\x1b[0m ",ev->time,
LEVEL_COLORS[ev->level], LEVEL_STRINGS[ev->level]);
if (ev->file) {
fprintf(stderr, "\x1b[90m(%s:%d)\x1b[0m ",
ev->file, ev->line);
}
vfprintf(stderr, ev->fmt, *ap);
fprintf(stderr, "\n");
fflush(stderr);
@@ -70,13 +74,22 @@ static void bzLoggerStdOutCallback(BzLoggerEvent *ev) {
static void bzLoggerFileCallback(BzLoggerEvent *ev) {
FILE *fp = ev->userData;
va_list *ap = ev->apList;
fprintf(fp, "%s %-5s %s:%d: ", ev->time, LEVEL_STRINGS[ev->level], ev->file, ev->line);
va_list *ap = ev->vaList;
fprintf(fp, "%s %-5s ", ev->time, LEVEL_STRINGS[ev->level]);
if (ev->file) {
fprintf(fp, "(%s:%d): ", ev->file, ev->line);
}
vfprintf(fp, ev->fmt, *ap);
fflush(fp);
}
void bzLoggerLog(BzLoggerLevel level, const char *file, int line, const char *fmt, ...) {
va_list args;
va_start(args, fmt);
bzLoggerLogV(level, file, line, fmt, &args);
va_end(args);
}
void bzLoggerLogV(BzLoggerLevel level, const char *file, int line, const char *fmt, void *va_list) {
BzLoggerEvent event = {NULL, NULL, level, file, line, fmt};
const int loggerLevel = bzLoggerGetLevel();
@@ -90,13 +103,8 @@ void bzLoggerLog(BzLoggerLevel level, const char *file, int line, const char *fm
if (!BZ_GET_LOGGER_MODULE()->silent && level <= loggerLevel) {
event.userData = stderr;
va_list ap;
va_start(ap, fmt);
event.apList = &ap;
event.vaList = va_list;
bzLoggerStdOutCallback(&event);
va_end(ap);
}
for (int i = 0; i < BZ_LOGGER_MAX_CALLBACKS; ++i) {
@@ -105,17 +113,21 @@ void bzLoggerLog(BzLoggerLevel level, const char *file, int line, const char *fm
if (level <= cb.level) {
event.userData = cb.userData;
va_list ap;
va_start(ap, fmt);
event.apList = &ap;
event.vaList = va_list;
cb.callback(&event);
va_end(ap);
}
}
}
void bzLoggerOnlyLog(BzLoggerLevel level, const char *fmt, ...) {
va_list args;
va_start(args, fmt);
bzLoggerOnlyLogV(level, fmt, &args);
va_end(args);
}
void bzLoggerOnlyLogV(BzLoggerLevel level, const char *fmt, void *va_list) {
bzLoggerLogV(level, NULL, -1, fmt, va_list);
}
bool bzLoggerAddFP(void *fp, BzLoggerLevel level) {
return bzLoggerAddCB(&(BzLoggerCallback) {