Added router log size checks

oscp · Aug 31, 2017 · 2069c53 · 2069c53
1 parent 29a760f
commit 2069c53
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/daemon/client/checks/openshift.go b/daemon/client/checks/openshift.go
@@ -272,8 +272,8 @@ func CheckRouterLogoutput() error {
 				}
 			}
 
-			if logSize < 100 {
-				return fmt.Errorf("Router %v has less log lines than 100. Seems that it is stuck!", routerName)
+			if logSize < 1 {
+				return fmt.Errorf("Router %v has no log lines. Seems that it is stuck!", routerName)
 			}
 		}
 	}
@@ -282,7 +282,7 @@ func CheckRouterLogoutput() error {
 }
 
 func getRouterLogSize(routerName string) (int, error) {
-	out, err := exec.Command("bash", "-c", "oc logs --timestamps=false --since=60s "+routerName+" | wc -l").Output()
+	out, err := exec.Command("bash", "-c", "oc logs -n default --timestamps=false --since=60s "+routerName+" | wc -l").Output()
 	if err != nil {
 		msg := fmt.Sprintf("Could not logs of router: %v, Error: %v", routerName, err.Error())
 		log.Println(msg)

diff --git a/daemon/client/handlers/major.go b/daemon/client/handlers/major.go
@@ -61,10 +61,6 @@ func HandleMajorChecks(daemonType string, w http.ResponseWriter, r *http.Request
 		if err := checks.CheckDnsServiceNode(); err != nil {
 			errors = append(errors, err.Error())
 		}
-
-		if err := checks.CheckRouterLogoutput(); err != nil {
-			errors = append(errors, err.Error())
-		}
 	}
 
 	if daemonType == "STORAGE" {

diff --git a/daemon/client/handlers/minor.go b/daemon/client/handlers/minor.go
@@ -56,6 +56,10 @@ func HandleMinorChecks(daemonType string, w http.ResponseWriter, r *http.Request
 		if err := checks.CheckLoggingRestartsCount(); err != nil {
 			errors = append(errors, err.Error())
 		}
+
+		if err := checks.CheckRouterLogoutput(); err != nil {
+			errors = append(errors, err.Error())
+		}
 	}
 
 	if daemonType == "STORAGE" {