--- lbbs/src/net_server.c 2025/05/17 05:56:17 1.36 +++ lbbs/src/net_server.c 2025/05/31 14:05:53 1.43 @@ -25,6 +25,7 @@ #include "fork.h" #include "menu.h" #include "file_loader.h" +#include "section_list_loader.h" #include #include #include @@ -129,6 +130,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; @@ -167,6 +169,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) @@ -177,13 +180,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); @@ -192,21 +194,35 @@ 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_shm(data_files_load_startup[i]) < 0) + 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"); + } + + if (SYS_section_list_reload && !SYS_server_exit) + { + SYS_section_list_reload = 0; + + if (section_list_loader_reload() < 0) + { + log_error("ksection_list_loader_reload() failed\n"); + } } nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second @@ -258,9 +274,16 @@ int net_server(const char *hostaddr, in_ log_std("Accept connection from %s:%d\n", hostaddr_client, port_client); - if (fork_server() < 0) + if (SYS_child_process_count - 1 < BBS_max_client) + { + if (fork_server() < 0) + { + log_error("fork_server() error\n"); + } + } + else { - log_error("fork_server() error\n"); + log_error("Rejected client connection over limit (%d)\n", SYS_child_process_count - 1); } if (close(socket_client) == -1)