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

config: use configured reader by default (#1717)

Browse Source
This commit is contained in:
Colin Hoglund 2020-06-19 03:49:30 -04:00 committed by GitHub
parent 8c7c27c573
commit 83cecdb294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/default.go
View File

@ -41,7 +41,6 @@ func newConfig(opts ...Option) (Config, error) {
func (c *config) Init(opts ...Option) error { func (c *config) Init(opts ...Option) error {
c.opts = Options{ c.opts = Options{
Loader: memory.NewLoader(),
Reader: json.NewReader(), Reader: json.NewReader(),
} }
c.exit = make(chan bool) c.exit = make(chan bool)
@ -49,6 +48,11 @@ func (c *config) Init(opts ...Option) error {
o(&c.opts) o(&c.opts)
} }
// default loader uses the configured reader
if c.opts.Loader == nil {
c.opts.Loader = memory.NewLoader(memory.WithReader(c.opts.Reader))
}
err := c.opts.Loader.Load(c.opts.Source...) err := c.opts.Loader.Load(c.opts.Source...)
if err != nil { if err != nil {
return err return err