Merge remote-tracking branch 'origin/master'

1 files changed, 8 insertions, 0 deletions

diff --git a/service/http/config.go b/service/http/config.go
index fb4574b1..19a2e71d 100644
--- a/service/http/config.go
+++ b/service/http/config.go
@@ -34,6 +34,14 @@ func (cfg *Config) Valid() error {
 		return errors.New("mailformed workers config")
 	}
 
+	if cfg.Workers.Pool == nil {
+		return errors.New("mailformed workers config (pool config is missing)")
+	}
+
+	if err := cfg.Workers.Pool.Valid(); err != nil {
+		return err
+	}
+
 	if !strings.Contains(cfg.Address, ":") {
 		return errors.New("mailformed server address")
 	}