yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-06-15 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(manager): let manager export LoadConfig

Browse Source
This commit is contained in:
bigeagle 2016-04-28 21:09:21 +08:00
parent 72d9f87711
commit 3874d41afc
No known key found for this signature in database
GPG Key ID: 9171A4571C27920A
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manager/config.go
View File

@ -29,7 +29,7 @@ type FileConfig struct {
CACert string `toml:"ca_cert"` CACert string `toml:"ca_cert"`
} }
func loadConfig(cfgFile string, c *cli.Context) (*Config, error) { func LoadConfig(cfgFile string, c *cli.Context) (*Config, error) {
cfg := new(Config) cfg := new(Config)
cfg.Server.Addr = "127.0.0.1" cfg.Server.Addr = "127.0.0.1"
@ -46,6 +46,10 @@ func loadConfig(cfgFile string, c *cli.Context) (*Config, error) {
} }
} }
if c == nil {
return cfg, nil
}
if c.String("addr") != "" { if c.String("addr") != "" {
cfg.Server.Addr = c.String("addr") cfg.Server.Addr = c.String("addr")
} }

8
manager/config_test.go
View File

@ -72,7 +72,7 @@ func TestConfig(t *testing.T) {
Convey("when giving no config options", func() { Convey("when giving no config options", func() {
app.Action = func(c *cli.Context) { app.Action = func(c *cli.Context) {
cfgFile := c.String("config") cfgFile := c.String("config")
cfg, err := loadConfig(cfgFile, c) cfg, err := LoadConfig(cfgFile, c)
So(err, ShouldEqual, nil) So(err, ShouldEqual, nil)
So(cfg.Server.Addr, ShouldEqual, "127.0.0.1") So(cfg.Server.Addr, ShouldEqual, "127.0.0.1")
} }
@ -83,7 +83,7 @@ func TestConfig(t *testing.T) {
app.Action = func(c *cli.Context) { app.Action = func(c *cli.Context) {
cfgFile := c.String("config") cfgFile := c.String("config")
So(cfgFile, ShouldEqual, tmpfile.Name()) So(cfgFile, ShouldEqual, tmpfile.Name())
conf, err := loadConfig(cfgFile, c) conf, err := LoadConfig(cfgFile, c)
So(err, ShouldEqual, nil) So(err, ShouldEqual, nil)
So(conf.Server.Addr, ShouldEqual, "0.0.0.0") So(conf.Server.Addr, ShouldEqual, "0.0.0.0")
So(conf.Server.Port, ShouldEqual, 5000) So(conf.Server.Port, ShouldEqual, 5000)
@ -99,7 +99,7 @@ func TestConfig(t *testing.T) {
app.Action = func(c *cli.Context) { app.Action = func(c *cli.Context) {
cfgFile := c.String("config") cfgFile := c.String("config")
So(cfgFile, ShouldEqual, "") So(cfgFile, ShouldEqual, "")
conf, err := loadConfig(cfgFile, c) conf, err := LoadConfig(cfgFile, c)
So(err, ShouldEqual, nil) So(err, ShouldEqual, nil)
So(conf.Server.Addr, ShouldEqual, "0.0.0.0") So(conf.Server.Addr, ShouldEqual, "0.0.0.0")
So(conf.Server.Port, ShouldEqual, 5001) So(conf.Server.Port, ShouldEqual, 5001)
@ -119,7 +119,7 @@ func TestConfig(t *testing.T) {
app.Action = func(c *cli.Context) { app.Action = func(c *cli.Context) {
cfgFile := c.String("config") cfgFile := c.String("config")
So(cfgFile, ShouldEqual, tmpfile.Name()) So(cfgFile, ShouldEqual, tmpfile.Name())
conf, err := loadConfig(cfgFile, c) conf, err := LoadConfig(cfgFile, c)
So(err, ShouldEqual, nil) So(err, ShouldEqual, nil)
So(conf.Server.Addr, ShouldEqual, "0.0.0.0") So(conf.Server.Addr, ShouldEqual, "0.0.0.0")
So(conf.Server.Port, ShouldEqual, 5000) So(conf.Server.Port, ShouldEqual, 5000)