Init config defaults outside of checker function

hellofresh · Sep 22, 2017 · d96a4df · d96a4df
1 parent e4a6e6b
commit d96a4df
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 106 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/checks/http/check.go b/checks/http/check.go
@@ -24,15 +24,15 @@ type Config struct {
 // - getting response status from defined URL
 // - verifying that status code is less than 500
 func New(config Config) func() error {
-	return func() error {
-		if config.LogFunc == nil {
-			config.LogFunc = func(err error, details string, extra ...interface{}) {}
-		}
+	if config.LogFunc == nil {
+		config.LogFunc = func(err error, details string, extra ...interface{}) {}
+	}
 
-		if config.RequestTimeout == 0 {
-			config.RequestTimeout = time.Second * 5
-		}
+	if config.RequestTimeout == 0 {
+		config.RequestTimeout = time.Second * 5
+	}
 
+	return func() error {
 		req, err := http.NewRequest(http.MethodGet, config.URL, nil)
 		if err != nil {
 			config.LogFunc(err, "Creating the request for the health check failed")

diff --git a/checks/postgres/check.go b/checks/postgres/check.go
@@ -32,11 +32,11 @@ type Config struct {
 // - selecting inserted row
 // - deleting inserted row
 func New(config Config) func() error {
-	return func() error {
-		if config.LogFunc == nil {
-			config.LogFunc = func(err error, details string, extra ...interface{}) {}
-		}
+	if config.LogFunc == nil {
+		config.LogFunc = func(err error, details string, extra ...interface{}) {}
+	}
 
+	return func() error {
 		db, err := sql.Open("postgres", config.DSN)
 		if err != nil {
 			config.LogFunc(err, "PostgreSQL health check failed during connect")

diff --git a/checks/rabbitmq/check.go b/checks/rabbitmq/check.go
@@ -41,32 +41,31 @@ type Config struct {
 // - publishing a message to the exchange with the defined routing key
 // - consuming published message
 func New(config Config) func() error {
-	return func() error {
-		if config.LogFunc == nil {
-			config.LogFunc = func(err error, details string, extra ...interface{}) {}
-		}
+	if config.LogFunc == nil {
+		config.LogFunc = func(err error, details string, extra ...interface{}) {}
+	}
 
-		if config.Exchange == "" {
-			config.Exchange = defaultExchange
-		}
+	if config.Exchange == "" {
+		config.Exchange = defaultExchange
+	}
 
-		if config.RoutingKey == "" {
-			host, err := os.Hostname()
-			if nil != err {
-				config.LogFunc(err, "RabbitMQ health check failed on settings default value for unset routing key")
-				return err
-			}
-			config.RoutingKey = host
+	if config.RoutingKey == "" {
+		host, err := os.Hostname()
+		if nil != err {
+			config.RoutingKey = "-unknown-"
 		}
+		config.RoutingKey = host
+	}
 
-		if config.Queue == "" {
-			config.Queue = fmt.Sprintf("%s.%s", config.Exchange, config.RoutingKey)
-		}
+	if config.Queue == "" {
+		config.Queue = fmt.Sprintf("%s.%s", config.Exchange, config.RoutingKey)
+	}
 
-		if config.ConsumeTimeout == 0 {
-			config.ConsumeTimeout = time.Second * 3
-		}
+	if config.ConsumeTimeout == 0 {
+		config.ConsumeTimeout = time.Second * 3
+	}
 
+	return func() error {
 		conn, err := amqp.Dial(config.DSN)
 		if err != nil {
 			config.LogFunc(err, "RabbitMQ health check failed on dial phase")

diff --git a/checks/redis/check.go b/checks/redis/check.go
@@ -20,11 +20,11 @@ type Config struct {
 // - connection establishing
 // - doing the PING command and verifying the response
 func New(config Config) func() error {
-	return func() error {
-		if config.LogFunc == nil {
-			config.LogFunc = func(err error, details string, extra ...interface{}) {}
-		}
+	if config.LogFunc == nil {
+		config.LogFunc = func(err error, details string, extra ...interface{}) {}
+	}
 
+	return func() error {
 		pool := &redis.Pool{
 			MaxIdle:     1,
 			IdleTimeout: 10 * time.Second,