Merge pull request #124 from Comcast/fix-nil-section-bug

Fix the missing section crash.
xmidt-org · Feb 23, 2019 · 746211f · 746211f
2 parents 1334f64 + e508f6a
commit 746211f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/caduceus/caduceus.go b/src/caduceus/caduceus.go
@@ -231,13 +231,13 @@ func caduceus(arguments []string) int {
 	//
 	// Now, initialize the service discovery infrastructure
 	//
-	e, err := servicecfg.NewEnvironment(logger, v.Sub("service"))
-	if err != nil {
-		logger.Log(level.Key(), level.ErrorValue(), logging.MessageKey(), "Unable to initialize service discovery environment", logging.ErrorKey(), err)
-		return 4
-	}
+	if v.IsSet("service") {
+		e, err := servicecfg.NewEnvironment(logger, v.Sub("service"))
+		if err != nil {
+			logger.Log(level.Key(), level.ErrorValue(), logging.MessageKey(), "Unable to initialize service discovery environment", logging.ErrorKey(), err)
+			return 4
+		}
 
-	if e != nil {
 		defer e.Close()
 		logger.Log(level.Key(), level.InfoValue(), "configurationFile", v.ConfigFileUsed())
 		e.Register()