Merge pull request #13 from spiral/pr/config-defaults-rewrite

Update config.go
spiral-modules · Apr 25, 2019 · 0c9b5ab · 0c9b5ab
2 parents aebee97 + f84dff4
commit 0c9b5ab
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/config.go b/config.go
@@ -27,13 +27,15 @@ type Config struct {
 
 // Hydrate populates config values.
 func (c *Config) Hydrate(cfg service.Config) (err error) {
-	if err := cfg.Unmarshal(&c); err != nil {
-		return err
+	c.parent = cfg
+
+	if c.Workers == nil {
+		c.Workers = &roadrunner.ServerConfig{}
 	}
+	c.Workers.InitDefaults()
 
-	c.parent = cfg
-	if c.Workers != nil {
-		c.Workers.InitDefaults()
+	if err := cfg.Unmarshal(&c); err != nil {
+		return err
 	}
 
 	c.pipelines, err = initPipelines(c.Pipelines)