--- lbbs/src/net_server.c 2025/05/15 06:24:11 1.34 +++ lbbs/src/net_server.c 2025/05/25 06:55:23 1.39 @@ -24,6 +24,7 @@ #include "io.h" #include "fork.h" #include "menu.h" +#include "file_loader.h" #include #include #include @@ -128,6 +129,7 @@ int net_server(const char *hostaddr, in_ sd_notify(0, "STOPPING=1"); sd_notify_stopping = 1; } + while ((SYS_child_exit || SYS_server_exit) && SYS_child_process_count > 0) { SYS_child_exit = 0; @@ -166,6 +168,7 @@ int net_server(const char *hostaddr, in_ if (SYS_menu_reload && !SYS_server_exit) { SYS_menu_reload = 0; + sd_notify(0, "RELOADING=1"); p_bbs_menu_new = calloc(1, sizeof(MENU_SET)); if (p_bbs_menu_new == NULL) @@ -176,13 +179,12 @@ int net_server(const char *hostaddr, in_ { unload_menu(p_bbs_menu_new); free(p_bbs_menu_new); + p_bbs_menu_new = NULL; log_error("Reload menu failed\n"); } else { - unload_menu_shm(p_bbs_menu_new); - unload_menu(p_bbs_menu); free(p_bbs_menu); @@ -191,6 +193,25 @@ int net_server(const char *hostaddr, in_ log_std("Reload menu successfully\n"); } + + sd_notify(0, "READY=1"); + } + + if (SYS_data_file_reload && !SYS_server_exit) + { + SYS_data_file_reload = 0; + sd_notify(0, "RELOADING=1"); + + for (int i = 0; i < data_files_load_startup_count; i++) + { + if (load_file(data_files_load_startup[i]) < 0) + { + log_error("load_file_mmap(%s) error\n", data_files_load_startup[i]); + } + } + + log_std("Reload data files successfully\n"); + sd_notify(0, "READY=1"); } nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second