mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-10-26 10:43:43 +00:00
add ss-manager read manager_address from config.json
This commit is contained in:
@@ -342,6 +342,8 @@ read_jconf(const char *file)
|
||||
conf.workdir = to_string(value);
|
||||
} else if (strcmp(name, "acl") == 0) {
|
||||
conf.acl = to_string(value);
|
||||
} else if (strcmp(name, "manager_address") == 0) {
|
||||
conf.manager_address = to_string(value);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -84,6 +84,7 @@ typedef struct {
|
||||
int no_delay;
|
||||
char *workdir;
|
||||
char *acl;
|
||||
char *manager_address;
|
||||
} jconf_t;
|
||||
|
||||
jconf_t *read_jconf(const char *file);
|
||||
|
||||
@@ -1054,6 +1054,9 @@ main(int argc, char **argv)
|
||||
if (acl == NULL) {
|
||||
acl = conf->acl;
|
||||
}
|
||||
if (manager_address == NULL) {
|
||||
manager_address = conf->manager_address;
|
||||
}
|
||||
#ifdef HAVE_SETRLIMIT
|
||||
if (nofile == 0) {
|
||||
nofile = conf->nofile;
|
||||
|
||||
Reference in New Issue
Block a user