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

merge cluster.conf and servers.conf

config_simplify
YuQing 2021-04-28 20:25:55 +08:00
parent 03b6d7b20a
commit 7d5e5d2340
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/sf_cluster_cfg.c
View File

@ -68,10 +68,9 @@ static int find_group_indexes_in_cluster_config(SFClusterConfig *cluster,
static int load_server_cfg(SFClusterConfig *cluster,
const char *cluster_filename, const int default_port,
char *full_server_filename, const int size)
const int size)
{
IniContext ini_context;
char *server_config_filename;
const int min_hosts_each_group = 1;
const bool share_between_groups = true;
int result;
@ -83,31 +82,17 @@ static int load_server_cfg(SFClusterConfig *cluster,
return result;
}
server_config_filename = iniGetStrValue(NULL,
"server_config_filename", &ini_context);
if (server_config_filename == NULL || *server_config_filename == '\0') {
logError("file: "__FILE__", line: %d, "
"config file: %s, item \"server_config_filename\" "
"not exist or empty", __LINE__, cluster_filename);
return ENOENT;
}
resolve_path(cluster_filename, server_config_filename,
full_server_filename, size);
if ((result=fc_server_load_from_file_ex(&cluster->server_cfg,
full_server_filename, default_port,
min_hosts_each_group, share_between_groups)) != 0)
{
return result;
}
result = fc_server_load_from_ini_context_ex(&cluster->server_cfg,
&ini_context, cluster_filename, default_port,
min_hosts_each_group, share_between_groups);
iniFreeContext(&ini_context);
return 0;
return result;
}
int sf_load_cluster_config_ex(SFClusterConfig *cluster, IniFullContext
*ini_ctx, const int default_port, char *full_cluster_filename,
char *full_server_filename, const int size)
const int size)
{
int result;
char *cluster_config_filename;
@ -124,7 +109,7 @@ int sf_load_cluster_config_ex(SFClusterConfig *cluster, IniFullContext
resolve_path(ini_ctx->filename, cluster_config_filename,
full_cluster_filename, size);
if ((result=load_server_cfg(cluster, full_cluster_filename,
default_port, full_server_filename, size)) != 0)
default_port, size)) != 0)
{
return result;
}

5
src/sf_cluster_cfg.h
View File

@ -25,15 +25,14 @@ extern "C" {
int sf_load_cluster_config_ex(SFClusterConfig *cluster, IniFullContext
*ini_ctx, const int default_port, char *full_cluster_filename,
char *full_server_filename, const int size);
const int size);
static inline int sf_load_cluster_config(SFClusterConfig *cluster,
IniFullContext *ini_ctx, const int default_port)
{
char full_cluster_filename[PATH_MAX];
char full_server_filename[PATH_MAX];
return sf_load_cluster_config_ex(cluster, ini_ctx, default_port,
full_cluster_filename, full_server_filename, PATH_MAX);
full_cluster_filename, PATH_MAX);
}
#ifdef __cplusplus