Fixed env variable check.

u220374 · u220374 · commit ae221c40431f · 2018-03-27T15:27:21.000+02:00
diff --git a/daemon/client/handlers/major.go b/daemon/client/handlers/major.go
@@ -24,12 +24,13 @@ func HandleMajorChecks(daemonType string, w http.ResponseWriter, r *http.Request
 		}
 	}
 
-	certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")
-	if len(certPaths) == 0 {
-		log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")
-	}
-
 	if daemonType == "MASTER" || daemonType == "NODE" {
+		certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")
+
+		if len(certPaths) == 0 {
+			log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")
+		}
+
 		if err := checks.CheckFileSslCertificates(strings.Split(certPaths, ","), 30); err != nil {
 			errors = append(errors, err.Error())
 		}
diff --git a/daemon/client/handlers/minor.go b/daemon/client/handlers/minor.go
@@ -21,12 +21,13 @@ func HandleMinorChecks(daemonType string, w http.ResponseWriter, r *http.Request
 		}
 	}
 
-	certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")
-	if len(certPaths) == 0 {
-		log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")
-	}
-
 	if daemonType == "MASTER" || daemonType == "NODE" {
+		certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")
+
+		if len(certPaths) == 0 {
+			log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")
+		}
+
 		if err := checks.CheckFileSslCertificates(strings.Split(certPaths, ","), 80); err != nil {
 			errors = append(errors, err.Error())
 		}

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,13 @@ func HandleMajorChecks(daemonType string, w http.ResponseWriter, r *http.Request`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")`
`28`		`- if len(certPaths) == 0 {`
`29`		`- log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")`
`30`		`- }`
`31`		`-`
`32`	`27`	`if daemonType == "MASTER" \|\| daemonType == "NODE" {`
	`28`	`+ certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")`
	`29`	`+`
	`30`	`+ if len(certPaths) == 0 {`
	`31`	`+ log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")`
	`32`	`+ }`
	`33`	`+`
`33`	`34`	`if err := checks.CheckFileSslCertificates(strings.Split(certPaths, ","), 30); err != nil {`
`34`	`35`	`errors = append(errors, err.Error())`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,13 @@ func HandleMinorChecks(daemonType string, w http.ResponseWriter, r *http.Request`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")`
`25`		`- if len(certPaths) == 0 {`
`26`		`- log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")`
`27`		`- }`
`28`		`-`
`29`	`24`	`if daemonType == "MASTER" \|\| daemonType == "NODE" {`
	`25`	`+ certPaths := os.Getenv("CHECK_CERTIFICATE_PATHS")`
	`26`	`+`
	`27`	`+ if len(certPaths) == 0 {`
	`28`	`+ log.Fatal("env variables 'CHECK_CERTIFICATE_PATHS' must be specified")`
	`29`	`+ }`
	`30`	`+`
`30`	`31`	`if err := checks.CheckFileSslCertificates(strings.Split(certPaths, ","), 80); err != nil {`
`31`	`32`	`errors = append(errors, err.Error())`
`32`	`33`	`}`