Skip to content

Fix bootstrap problem with logger function. #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlbertShown merged 1 commit into from
Oct 21, 2025
Merged

Fix bootstrap problem with logger function. #657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/webui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,6 @@ typedef struct _webui_core_t {
char* default_server_root_path;
bool ui;
char* custom_browser_folder_path;
void (*logger_func)(size_t level, const char* log, void* user_data);
void* logger_user_data;
#ifdef WEBUI_TLS
char* root_cert;
char* root_key;
Expand All @@ -466,6 +464,11 @@ typedef struct _webui_core_t {
}
_webui_core_t;

typedef struct _webui_log_t {
void (*logger_func)(size_t level, const char* log, void* user_data);
void* logger_user_data;
} _webui_log_t;

typedef struct _webui_recv_arg_t {
_webui_window_t* win;
void * ptr;
Expand Down Expand Up @@ -694,6 +697,7 @@ static WEBUI_THREAD_MONITOR;

// -- Heap ----------------------------
static _webui_core_t _webui;
static _webui_log_t _webui_log_data = { NULL, NULL };
static const char* webui_html_served = "<html><head><title>Access Denied</title><script src=\"/webui.js\"></script><style>"
"body{margin:0;background-repeat:no-repeat;background-attachment:fixed;background-color:#FF3CAC;background-image:linear-"
"gradient(225deg,#FF3CAC 0%,#784BA0 45%,#2B86C5 100%);font-family:sans-serif;margin:20px;color:#fff}a{color:#fff}</style>"
Expand All @@ -710,7 +714,7 @@ static const char* webui_def_icon = "<svg xmlns=\"http://www.w3.org/2000/svg\" w
// -- Logs ----------------------------

static void _webui_log(size_t level, const char *format, va_list args) {
if (_webui.logger_func == NULL) {
if (_webui_log_data.logger_func == NULL) {
// Print log directly
if (level == WEBUI_LOGGER_LEVEL_ERROR) {
vfprintf(stderr, format, args);
Expand All @@ -724,16 +728,16 @@ static void _webui_log(size_t level, const char *format, va_list args) {
int needed_size = vsnprintf(NULL, 0, format, args_copy);
va_end(args_copy);
if (needed_size < 0) {
_webui.logger_func(WEBUI_LOGGER_LEVEL_ERROR, "Log formatting error", _webui.logger_user_data);
_webui_log_data.logger_func(WEBUI_LOGGER_LEVEL_ERROR, "Log formatting error", _webui_log_data.logger_user_data);
return;
}
char *buffer = _webui_malloc(needed_size + 1);
if (buffer == NULL) {
_webui.logger_func(WEBUI_LOGGER_LEVEL_ERROR, "Memory allocation failed for log", _webui.logger_user_data);
_webui_log_data.logger_func(WEBUI_LOGGER_LEVEL_ERROR, "Memory allocation failed for log", _webui_log_data.logger_user_data);
return;
}
vsnprintf(buffer, needed_size + 1, format, args);
_webui.logger_func(level, buffer, _webui.logger_user_data);
_webui_log_data.logger_func(level, buffer, _webui_log_data.logger_user_data);
_webui_free_mem((void*)buffer);
}
}
Expand All @@ -742,23 +746,26 @@ static void _webui_log_debug(const char *format, ...) {
va_list args;
va_start(args, format);
_webui_log(WEBUI_LOGGER_LEVEL_DEBUG, format, args);
va_end(args);
}

static void _webui_log_info(const char *format, ...) {
va_list args;
va_start(args, format);
_webui_log(WEBUI_LOGGER_LEVEL_INFO, format, args);
va_end(args);
}

static void _webui_log_error(const char *format, ...) {
va_list args;
va_start(args, format);
_webui_log(WEBUI_LOGGER_LEVEL_ERROR, format, args);
va_end(args);
}

void webui_set_logger(void (*func)(size_t level, const char* log, void* user_data), void *user_data) {
_webui.logger_func = func;
_webui.logger_user_data = user_data;
_webui_log_data.logger_func = func;
_webui_log_data.logger_user_data = user_data;
}

// -- Functions -----------------------
Expand Down
Loading