fix #529: exit with code 7 when error was logged

golangci · Jun 10, 2019 · 4ba2155 · 4ba2155
1 parent 7274db7
commit 4ba2155
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/pkg/commands/run.go b/pkg/commands/run.go
@@ -415,13 +415,23 @@ func (e *Executor) setupExitCode(ctx context.Context) {
 	if ctx.Err() != nil {
 		e.exitCode = exitcodes.Timeout
 		e.log.Errorf("Deadline exceeded: try increase it by passing --deadline option")
+		return
 	}
 
-	if e.exitCode == exitcodes.Success &&
-		(os.Getenv("GL_TEST_RUN") == "1" || os.Getenv("FAIL_ON_WARNINGS") == "1") &&
-		len(e.reportData.Warnings) != 0 {
+	if e.exitCode != exitcodes.Success {
+		return
+	}
 
+	needFailOnWarnings := (os.Getenv("GL_TEST_RUN") == "1" || os.Getenv("FAIL_ON_WARNINGS") == "1")
+	if needFailOnWarnings && len(e.reportData.Warnings) != 0 {
 		e.exitCode = exitcodes.WarningInTest
+		return
+	}
+
+	if e.reportData.Error != "" {
+		// it's a case e.g. when typecheck linter couldn't parse and error and just logged it
+		e.exitCode = exitcodes.ErrorWasLogged
+		return
 	}
 }
 

diff --git a/pkg/exitcodes/exitcodes.go b/pkg/exitcodes/exitcodes.go
@@ -8,6 +8,7 @@ const (
 	Timeout              = 4
 	NoGoFiles            = 5
 	NoConfigFileDetected = 6
+	ErrorWasLogged       = 7
 )
 
 type ExitError struct {