Fix cluster logs (#5195)

1 files changed, 18 insertions, 9 deletions

diff --git a/app/admin.go b/app/admin.go
index c694285fa..51e69da57 100644
--- a/app/admin.go
+++ b/app/admin.go
@@ -19,6 +19,24 @@ import (
 )
 
 func GetLogs() ([]string, *model.AppError) {
+	lines, err := GetLogsSkipSend()
+	if err != nil {
+		return nil, err
+	}
+
+	if einterfaces.GetClusterInterface() != nil {
+		clines, err := einterfaces.GetClusterInterface().GetLogs()
+		if err != nil {
+			return nil, err
+		}
+
+		lines = append(lines, clines...)
+	}
+
+	return lines, nil
+}
+
+func GetLogsSkipSend() ([]string, *model.AppError) {
 	var lines []string
 
 	if utils.Cfg.LogSettings.EnableFile {
@@ -37,15 +55,6 @@ func GetLogs() ([]string, *model.AppError) {
 		lines = append(lines, "")
 	}
 
-	if einterfaces.GetClusterInterface() != nil {
-		clines, err := einterfaces.GetClusterInterface().GetLogs()
-		if err != nil {
-			return nil, err
-		}
-
-		lines = append(lines, clines...)
-	}
-
 	return lines, nil
 }