Skip to content
This repository was archived by the owner on Jan 15, 2022. It is now read-only.

Commit 0c9b5ab

Browse files
authored
Merge pull request #13 from spiral/pr/config-defaults-rewrite
Update config.go
2 parents aebee97 + f84dff4 commit 0c9b5ab

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

config.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ type Config struct {
2727

2828
// Hydrate populates config values.
2929
func (c *Config) Hydrate(cfg service.Config) (err error) {
30-
if err := cfg.Unmarshal(&c); err != nil {
31-
return err
30+
c.parent = cfg
31+
32+
if c.Workers == nil {
33+
c.Workers = &roadrunner.ServerConfig{}
3234
}
35+
c.Workers.InitDefaults()
3336

34-
c.parent = cfg
35-
if c.Workers != nil {
36-
c.Workers.InitDefaults()
37+
if err := cfg.Unmarshal(&c); err != nil {
38+
return err
3739
}
3840

3941
c.pipelines, err = initPipelines(c.Pipelines)

0 commit comments

Comments
 (0)