pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sf_load_global_config_ex: server_name can be NULL

posix_api
YuQing 2022-03-03 10:00:29 +08:00
parent 6549172c67
commit 8de3678e86
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sf_global.c
View File

@ -352,15 +352,17 @@ int sf_load_global_config_ex(const char *server_name,
ini_ctx->section_name = old_section_name; ini_ctx->section_name = old_section_name;
load_log_level(ini_ctx->context); load_log_level(ini_ctx->context);
if ((result=log_set_prefix(SF_G_BASE_PATH_STR, server_name)) != 0) { if (server_name != NULL) {
return result; if ((result=log_set_prefix(SF_G_BASE_PATH_STR, server_name)) != 0) {
return result;
}
} }
return 0; return 0;
} }
int sf_load_config_ex(const char *server_name, int sf_load_config_ex(const char *server_name, SFContextIniConfig
SFContextIniConfig *config, const int task_buffer_extra_size) *config, const int task_buffer_extra_size)
{ {
int result; int result;
if ((result=sf_load_global_config_ex(server_name, &config->ini_ctx, if ((result=sf_load_global_config_ex(server_name, &config->ini_ctx,

6
src/sf_service.c
View File

@ -169,6 +169,7 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
return ENOMEM; return ENOMEM;
} }
g_current_time = time(NULL);
sf_context->thread_count = 0; sf_context->thread_count = 0;
data_end = sf_context->thread_data + sf_context->work_threads; data_end = sf_context->thread_data + sf_context->work_threads;
for (thread_data=sf_context->thread_data,thread_ctx=thread_contexts; for (thread_data=sf_context->thread_data,thread_ctx=thread_contexts;
@ -198,9 +199,8 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
2 * g_sf_global_vars.network_timeout, g_current_time); 2 * g_sf_global_vars.network_timeout, g_current_time);
if (result != 0) { if (result != 0) {
logError("file: "__FILE__", line: %d, " logError("file: "__FILE__", line: %d, "
"fast_timer_init fail, " "fast_timer_init fail, errno: %d, error info: %s",
"errno: %d, error info: %s", __LINE__, result, strerror(result));
__LINE__, result, strerror(result));
return result; return result;
} }