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

sf_load_cluster_config_ex: add param full_cluster_filename

storage_pool
YuQing 2021-04-12 15:29:46 +08:00
parent ee179a16f7
commit 2792b2f275
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sf_cluster_cfg.c
View File

@ -105,13 +105,12 @@ static int load_server_cfg(SFClusterConfig *cluster,
return 0; return 0;
} }
int sf_load_cluster_config_ex(SFClusterConfig *cluster, int sf_load_cluster_config_ex(SFClusterConfig *cluster, IniFullContext
IniFullContext *ini_ctx, const int default_port, *ini_ctx, const int default_port, char *full_cluster_filename,
char *full_server_filename, const int size) char *full_server_filename, const int size)
{ {
int result; int result;
char *cluster_config_filename; char *cluster_config_filename;
char full_cluster_filename[PATH_MAX];
cluster_config_filename = iniGetStrValue(ini_ctx->section_name, cluster_config_filename = iniGetStrValue(ini_ctx->section_name,
"cluster_config_filename", ini_ctx->context); "cluster_config_filename", ini_ctx->context);
@ -123,7 +122,7 @@ int sf_load_cluster_config_ex(SFClusterConfig *cluster,
} }
resolve_path(ini_ctx->filename, cluster_config_filename, resolve_path(ini_ctx->filename, cluster_config_filename,
full_cluster_filename, sizeof(full_cluster_filename)); full_cluster_filename, size);
if ((result=load_server_cfg(cluster, full_cluster_filename, if ((result=load_server_cfg(cluster, full_cluster_filename,
default_port, full_server_filename, size)) != 0) default_port, full_server_filename, size)) != 0)
{ {

7
src/sf_cluster_cfg.h
View File

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