only report tasklogger is running if both stdout and stderr are still…

… running
hashicorp · Jun 12, 2020 · 42658b7 · 42658b7
1 parent ef67b1b
commit 42658b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/client/logmon/logmon.go b/client/logmon/logmon.go
@@ -110,14 +110,10 @@ type TaskLogger struct {
 
 // IsRunning will return true as long as one rotator wrapper is still running
 func (tl *TaskLogger) IsRunning() bool {
-	if tl.lro != nil && tl.lro.isRunning() {
-		return true
-	}
-	if tl.lre != nil && tl.lre.isRunning() {
-		return true
-	}
+	lroRunning := tl.lro != nil && tl.lro.isRunning()
+	lreRunning := tl.lre != nil && tl.lre.isRunning()
 
-	return false
+	return lroRunning && lreRunning
 }
 
 func (tl *TaskLogger) Close() {

diff --git a/client/logmon/logmon_test.go b/client/logmon/logmon_test.go
@@ -235,7 +235,6 @@ func TestLogmon_Start_restart(t *testing.T) {
 	require.True(impl.tl.IsRunning())
 
 	// Close stdout and assert that logmon no longer writes to the file
-	require.NoError(stdout.Close())
 	require.NoError(stderr.Close())
 
 	testutil.WaitForResult(func() (bool, error) {