Fix missing configuration options panics (#105)

Fix invalid minWait for backoff notifier when SubscriptionBackoffMax not set

cmd/executor/main.go

@@ -103,6 +103,7 @@ func readConfiguration(config interface{}) {
 
 func main() {
 	log.Infof("Allegro Mesos Executor (version: %s)", Version)
+
 	cfg, err := config.FromEnv()
 	if err != nil {
 		log.WithError(err).Fatal("Failed to load Mesos configuration")
@@ -118,8 +119,8 @@ func main() {
 	Config.MesosConfig.Checkpoint = cfg.Checkpoint
 	Config.MesosConfig.RecoveryTimeout = cfg.RecoveryTimeout
 	Config.MesosConfig.SubscriptionBackoffMax = cfg.SubscriptionBackoffMax
-	exec := executor.NewExecutor(Config, createHooks()...)
-	if err := exec.Start(); err != nil {
+	err = executor.StartExecutor(Config, createHooks())
+	if err != nil {
 		log.WithError(err).Fatal("Executor exited with error")
 	}
 	log.Info("Executor exited successfully")

executor.go

@@ -151,6 +151,32 @@ func NewExecutor(cfg Config, hooks ...hook.Hook) *Executor {
 	}
 }
 
+// StartExecutor creates a new executor instance nad starts it
+func StartExecutor(conf Config, hooks []hook.Hook) error {
+	exec := NewExecutor(sanitizeConfig(conf), hooks...)
+	return exec.Start()
+}
+
+func sanitizeConfig(conf Config) Config {
+	if conf.RandomExpirationRange <= 0 {
+		conf.RandomExpirationRange = 3 * time.Hour
+	}
+	if conf.APIPath == "" {
+		conf.APIPath = "/api/v1/executor"
+	}
+	if conf.HTTPTimeout <= 0 {
+		conf.HTTPTimeout = 10 * time.Second
+	}
+	if conf.MesosConfig.RecoveryTimeout <= 0 {
+		conf.MesosConfig.RecoveryTimeout = time.Second
+	}
+	if conf.MesosConfig.SubscriptionBackoffMax < time.Second {
+		conf.MesosConfig.SubscriptionBackoffMax = time.Second
+	}
+
+	return conf
+}
+
 // Start registers executor in Mesos agent and waits for events from it.
 func (e *Executor) Start() error {
 

executor_test.go

@@ -5,10 +5,9 @@ import (
 	"crypto/x509"
 	"errors"
 	"testing"
-
 	"time"
 
-	mesos "github.com/mesos/mesos-go/api/v1/lib"
+	"github.com/mesos/mesos-go/api/v1/lib"
 	"github.com/mesos/mesos-go/api/v1/lib/executor"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -382,6 +381,12 @@ func TestIfNotPanicsWhenKillWithoutLaunch(t *testing.T) {
 	})
 }
 
+func TestIfExecutorStartsWithoutConfig(t *testing.T) {
+	assert.NotPanics(t, func() {
+		StartExecutor(Config{}, []hook.Hook{})
+	})
+}
+
 type mockClock struct {
 	mock.Mock
 }