unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 2 Actions 2 Packages Projects Releases 262 Wiki Activity

handle Loader.Load return value error

Browse Source
This commit is contained in:
Allenxuxu 2020-01-19 16:31:02 +08:00
parent 1983d607f3
commit a82fd19209
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@ -43,11 +43,11 @@ type Option func(o *Options)
var ( var (
// Default Config Manager // Default Config Manager
DefaultConfig = NewConfig() DefaultConfig, _ = NewConfig()
) )
// NewConfig returns new config // NewConfig returns new config
func NewConfig(opts ...Option) Config { func NewConfig(opts ...Option) (Config, error) {
return newConfig(opts...) return newConfig(opts...)
} }

9
config/default.go
View File

@ -30,7 +30,7 @@ type watcher struct {
value reader.Value value reader.Value
} }
func newConfig(opts ...Option) Config { func newConfig(opts ...Option) (Config, error) {
options := Options{ options := Options{
Loader: memory.NewLoader(), Loader: memory.NewLoader(),
Reader: json.NewReader(), Reader: json.NewReader(),
@ -40,7 +40,10 @@ func newConfig(opts ...Option) Config {
o(&options) o(&options)
} }
options.Loader.Load(options.Source...) if err := options.Loader.Load(options.Source...); err != nil {
return nil, err
}
snap, _ := options.Loader.Snapshot() snap, _ := options.Loader.Snapshot()
vals, _ := options.Reader.Values(snap.ChangeSet) vals, _ := options.Reader.Values(snap.ChangeSet)
@ -53,7 +56,7 @@ func newConfig(opts ...Option) Config {
go c.run() go c.run()
return c return c, nil
} }
func (c *config) run() { func (c *config) run() {

23
config/default_test.go
View File

@ -55,7 +55,10 @@ func TestConfigLoadWithGoodFile(t *testing.T) {
}() }()
// Create new config // Create new config
conf := NewConfig() conf, err := NewConfig()
if err != nil {
t.Fatalf("Expected no error but got %v", err)
}
// Load file source // Load file source
if err := conf.Load(file.NewSource( if err := conf.Load(file.NewSource(
file.WithPath(path), file.WithPath(path),
@ -73,9 +76,12 @@ func TestConfigLoadWithInvalidFile(t *testing.T) {
}() }()
// Create new config // Create new config
conf := NewConfig() conf, err := NewConfig()
if err != nil {
t.Fatalf("Expected no error but got %v", err)
}
// Load file source // Load file source
err := conf.Load(file.NewSource( err = conf.Load(file.NewSource(
file.WithPath(path), file.WithPath(path),
file.WithPath("/i/do/not/exists.json"), file.WithPath("/i/do/not/exists.json"),
)) ))
@ -105,13 +111,18 @@ func TestConfigMerge(t *testing.T) {
}() }()
os.Setenv("AMQP_HOST", "rabbit.testing.com") os.Setenv("AMQP_HOST", "rabbit.testing.com")
conf := NewConfig() conf, err := NewConfig()
conf.Load( if err != nil {
t.Fatalf("Expected no error but got %v", err)
}
if err := conf.Load(
file.NewSource( file.NewSource(
file.WithPath(path), file.WithPath(path),
), ),
env.NewSource(), env.NewSource(),
) ); err != nil {
t.Fatalf("Expected no error but got %v", err)
}
actualHost := conf.Get("amqp", "host").String("backup") actualHost := conf.Get("amqp", "host").String("backup")
if actualHost != "rabbit.testing.com" { if actualHost != "rabbit.testing.com" {