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

sf_log_config refined

connection_manager
yuqing 2018-05-14 18:40:20 +08:00
parent 27b208c296
commit 5f7e472692
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sf_global.c
View File

@ -270,7 +270,7 @@ int sf_load_config(const char *server_name, const char *filename,
return 0; return 0;
} }
void sf_log_config() void sf_log_config_ex(const char *other_config)
{ {
logInfo("base_path=%s, inner_port=%d, inner_bind_addr=%s, " logInfo("base_path=%s, inner_port=%d, inner_bind_addr=%s, "
"outer_port=%d, outer_bind_addr=%s, " "outer_port=%d, outer_bind_addr=%s, "
@ -278,7 +278,7 @@ void sf_log_config()
"connect_timeout=%d, network_timeout=%d, thread_stack_size=%d, " "connect_timeout=%d, network_timeout=%d, thread_stack_size=%d, "
"max_pkg_size=%d, min_buff_size=%d, max_buff_size=%d, " "max_pkg_size=%d, min_buff_size=%d, max_buff_size=%d, "
"log_level=%s, sync_log_buff_interval=%d, rotate_error_log=%d, " "log_level=%s, sync_log_buff_interval=%d, rotate_error_log=%d, "
"log_file_keep_days=%d, run_by_group=%s, run_by_user=%s", "log_file_keep_days=%d, run_by_group=%s, run_by_user=%s%s%s",
g_sf_global_vars.base_path, g_sf_global_vars.base_path,
g_sf_global_vars.inner_port, g_sf_global_vars.inner_port,
g_sf_global_vars.inner_bind_addr, g_sf_global_vars.inner_bind_addr,
@ -298,6 +298,8 @@ void sf_log_config()
g_sf_global_vars.rotate_error_log, g_sf_global_vars.rotate_error_log,
g_sf_global_vars.log_file_keep_days, g_sf_global_vars.log_file_keep_days,
g_sf_global_vars.run_by_group, g_sf_global_vars.run_by_group,
g_sf_global_vars.run_by_user g_sf_global_vars.run_by_user,
(other_config != NULL ? ", " : ""),
(other_config != NULL ? other_config : "")
); );
} }

4
src/sf_global.h
View File

@ -57,7 +57,9 @@ int sf_load_config(const char *server_name, const char *filename,
IniContext *pIniContext, const int default_inner_port, IniContext *pIniContext, const int default_inner_port,
const int default_outer_port); const int default_outer_port);
void sf_log_config(); void sf_log_config_ex(const char *other_config);
#define sf_log_config() sf_log_config_ex(NULL)
#ifdef __cplusplus #ifdef __cplusplus
} }

4
src/sf_service.c
View File

@ -47,7 +47,7 @@ int sf_service_init(sf_alloc_thread_extra_data_callback
sf_recv_timeout_callback timeout_callback, const int net_timeout_ms, sf_recv_timeout_callback timeout_callback, const int net_timeout_ms,
const int proto_header_size, const int task_arg_size) const int proto_header_size, const int task_arg_size)
{ {
#define ALLOC_CONNECTIONS_ONCE 256 #define ALLOC_CONNECTIONS_ONCE 1024
int result; int result;
int bytes; int bytes;
int m; int m;
@ -74,7 +74,7 @@ int sf_service_init(sf_alloc_thread_extra_data_callback
return result; return result;
} }
m = g_sf_global_vars.min_buff_size / (16 * 1024); m = g_sf_global_vars.min_buff_size / (64 * 1024);
if (m == 0) { if (m == 0) {
m = 1; m = 1;
} else if (m > 16) { } else if (m > 16) {