From 8b56fda1e9975fe49ef67f987d6259cb1777659a Mon Sep 17 00:00:00 2001 From: bigeagle Date: Thu, 28 Apr 2016 10:50:51 +0800 Subject: [PATCH] feature(worker): added worker http server config --- worker/config.go | 9 +++++++++ worker/config_test.go | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/worker/config.go b/worker/config.go index 4c5e0bb..9c96aa1 100644 --- a/worker/config.go +++ b/worker/config.go @@ -49,6 +49,7 @@ func (p *ProviderEnum) UnmarshalText(text []byte) error { type Config struct { Global globalConfig `toml:"global"` Manager managerConfig `toml:"manager"` + Server serverConfig `toml:"server"` Mirrors []mirrorConfig `toml:"mirrors"` } @@ -66,6 +67,14 @@ type managerConfig struct { Token string `toml:"token"` } +type serverConfig struct { + Hostname string `toml:"hostname"` + Addr string `toml:"listen_addr"` + Port int `toml:"listen_port"` + SSLCert string `toml:"ssl_cert"` + SSLKey string `toml:"ssl_key"` +} + type mirrorConfig struct { Name string `toml:"name"` Provider ProviderEnum `toml:"provider"` diff --git a/worker/config_test.go b/worker/config_test.go index c5ac4f3..a4de3cb 100644 --- a/worker/config_test.go +++ b/worker/config_test.go @@ -21,6 +21,13 @@ interval = 240 api_base = "https://127.0.0.1:5000" token = "some_token" +[server] +hostname = "worker1.example.com" +listen_addr = "127.0.0.1" +listen_port = 6000 +ssl_cert = "/etc/tunasync.d/worker1.cert" +ssl_key = "/etc/tunasync.d/worker1.key" + [[mirrors]] name = "AOSP" provider = "command" @@ -68,6 +75,7 @@ exclude_file = "/etc/tunasync.d/fedora-exclude.txt" So(cfg.Global.MirrorDir, ShouldEqual, "/data/mirrors") So(cfg.Manager.APIBase, ShouldEqual, "https://127.0.0.1:5000") + So(cfg.Server.Hostname, ShouldEqual, "worker1.example.com") m := cfg.Mirrors[0] So(m.Name, ShouldEqual, "AOSP")