Browse Source

add ss-manager read manager_address from config.json

pull/2697/head
root 4 years ago
parent
commit
02f25e588c
3 changed files with 6 additions and 0 deletions
  1. 2
      src/jconf.c
  2. 1
      src/jconf.h
  3. 3
      src/manager.c

2
src/jconf.c

@ -342,6 +342,8 @@ read_jconf(const char *file)
conf.workdir = to_string(value); conf.workdir = to_string(value);
} else if (strcmp(name, "acl") == 0) { } else if (strcmp(name, "acl") == 0) {
conf.acl = to_string(value); conf.acl = to_string(value);
} else if (strcmp(name, "manager_address") == 0) {
conf.manager_address = to_string(value);
} }
} }
} else { } else {

1
src/jconf.h

@ -84,6 +84,7 @@ typedef struct {
int no_delay; int no_delay;
char *workdir; char *workdir;
char *acl; char *acl;
char *manager_address;
} jconf_t; } jconf_t;
jconf_t *read_jconf(const char *file); jconf_t *read_jconf(const char *file);

3
src/manager.c

@ -1054,6 +1054,9 @@ main(int argc, char **argv)
if (acl == NULL) { if (acl == NULL) {
acl = conf->acl; acl = conf->acl;
} }
if (manager_address == NULL) {
manager_address = conf->manager_address;
}
#ifdef HAVE_SETRLIMIT #ifdef HAVE_SETRLIMIT
if (nofile == 0) { if (nofile == 0) {
nofile = conf->nofile; nofile = conf->nofile;

Loading…
Cancel
Save