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

fixed sf_load_read_rule_config

connection_manager
YuQing 2020-09-13 21:10:29 +08:00
parent 1e6d4da265
commit 17d3af8fd5
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sf_configs.c
View File

@ -71,7 +71,7 @@ void sf_net_retry_config_to_string(SFNetRetryConfig *net_retry_cfg,
"connect_retry_interval_ms=%d ms, network_retry_times=%d, "
"network_retry_interval_ms=%d ms",
(net_retry_cfg->interval_mm.mode ==
sf_net_retry_interval_mode_fixed ? "fixed" : "multipl"),
sf_net_retry_interval_mode_fixed ? "fixed" : "multiple"),
net_retry_cfg->interval_mm.max_interval_ms,
net_retry_cfg->connect.times,
net_retry_cfg->connect.interval_ms,
@ -86,11 +86,11 @@ void sf_load_read_rule_config(SFDataReadRule *rule, IniFullContext *ini_ctx)
"read_rule", ini_ctx->context, true);
if (read_rule == NULL || *read_rule == '\0') {
*rule = sf_data_read_rule_any_available;
} else if (strncasecmp(read_rule, "any", 3)) {
} else if (strncasecmp(read_rule, "any", 3) == 0) {
*rule = sf_data_read_rule_any_available;
} else if (strncasecmp(read_rule, "slave", 5)) {
} else if (strncasecmp(read_rule, "slave", 5) == 0) {
*rule = sf_data_read_rule_slave_first;
} else if (strncasecmp(read_rule, "master", 6)) {
} else if (strncasecmp(read_rule, "master", 6) == 0) {
*rule = sf_data_read_rule_master_only;
} else {
logError("file: "__FILE__", line: %d, "

2
src/sf_define.h
View File

@ -6,7 +6,7 @@
#include "fastcommon/sockopt.h"
#define SF_DEF_THREAD_STACK_SIZE (64 * 1024)
#define SF_DEF_MAX_PACKAGE_SIZE (16 * 1024)
#define SF_DEF_MAX_PACKAGE_SIZE (64 * 1024)
#define SF_DEF_MIN_BUFF_SIZE (64 * 1024)
#define SF_DEF_MAX_BUFF_SIZE (64 * 1024)

6
src/sf_global.c
View File

@ -19,9 +19,9 @@
SFGlobalVariables g_sf_global_vars = {
DEFAULT_CONNECT_TIMEOUT, DEFAULT_NETWORK_TIMEOUT,
{'/', 't', 'm', 'p', '\0'}, true,
SF_DEF_THREAD_STACK_SIZE, DEFAULT_MAX_CONNECTONS,
SF_DEF_MAX_PACKAGE_SIZE, SF_DEF_MIN_BUFF_SIZE, SF_DEF_MAX_BUFF_SIZE,
{'/', 't', 'm', 'p', '\0'}, true, DEFAULT_MAX_CONNECTONS,
SF_DEF_MAX_PACKAGE_SIZE, SF_DEF_MIN_BUFF_SIZE,
SF_DEF_MAX_BUFF_SIZE, SF_DEF_THREAD_STACK_SIZE,
SYNC_LOG_BUFF_DEF_INTERVAL, 0, 0, 0, {'\0'}, {'\0'}, false, 0, {0, 0}
};

6
src/sf_nio.c
View File

@ -184,6 +184,9 @@ static int sf_client_sock_connect(int sock, short event, void *arg)
return -1;
}
logInfo("file: "__FILE__", line: %d, "
"connect to server %s:%d successfully",
__LINE__, task->server_ip, task->port);
sf_nio_set_stage(task, SF_NIO_STAGE_HANDSHAKE);
return SF_CTX->deal_task(task);
}
@ -207,6 +210,9 @@ static int sf_connect_server(struct fast_task_info *task)
return result;
}
logInfo("file: "__FILE__", line: %d, "
"connect to server %s:%d successfully",
__LINE__, task->server_ip, task->port);
sf_nio_set_stage(task, SF_NIO_STAGE_HANDSHAKE);
return SF_CTX->deal_task(task);
} else if (result == EINPROGRESS) {