From 02f25e588c9ebc02476eb615e9ef73926a180498 Mon Sep 17 00:00:00 2001
From: root <root@alpaca.k8e.net>
Date: Sat, 2 May 2020 10:57:36 +0800
Subject: [PATCH] add ss-manager read manager_address from config.json

---
 src/jconf.c   | 2 ++
 src/jconf.h   | 1 +
 src/manager.c | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/src/jconf.c b/src/jconf.c
index b9c5068a..dd38ee96 100644
--- a/src/jconf.c
+++ b/src/jconf.c
@@ -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 {
diff --git a/src/jconf.h b/src/jconf.h
index 4c88a823..ed0ecafc 100644
--- a/src/jconf.h
+++ b/src/jconf.h
@@ -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);
diff --git a/src/manager.c b/src/manager.c
index 5f2742ff..fd3c645c 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -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;