From 5f7e472692b1c7c2de3ca46b278d23838daf33b7 Mon Sep 17 00:00:00 2001 From: yuqing Date: Mon, 14 May 2018 18:40:20 +0800 Subject: [PATCH] sf_log_config refined --- src/sf_global.c | 8 +++++--- src/sf_global.h | 4 +++- src/sf_service.c | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/sf_global.c b/src/sf_global.c index bb5a46e..38e15f0 100644 --- a/src/sf_global.c +++ b/src/sf_global.c @@ -270,7 +270,7 @@ int sf_load_config(const char *server_name, const char *filename, 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, " "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, " "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_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.inner_port, 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.log_file_keep_days, 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 : "") ); } diff --git a/src/sf_global.h b/src/sf_global.h index 3ef25a2..563a8e1 100644 --- a/src/sf_global.h +++ b/src/sf_global.h @@ -57,7 +57,9 @@ int sf_load_config(const char *server_name, const char *filename, IniContext *pIniContext, const int default_inner_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 } diff --git a/src/sf_service.c b/src/sf_service.c index 79cf7f5..1d614cb 100644 --- a/src/sf_service.c +++ b/src/sf_service.c @@ -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, const int proto_header_size, const int task_arg_size) { -#define ALLOC_CONNECTIONS_ONCE 256 +#define ALLOC_CONNECTIONS_ONCE 1024 int result; int bytes; int m; @@ -74,7 +74,7 @@ int sf_service_init(sf_alloc_thread_extra_data_callback 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) { m = 1; } else if (m > 16) {