瀏覽代碼

Merge pull request #43839 from thaJeztah/journald_fix_break

logger/journald: fix SA4011: ineffective break statement
Sebastiaan van Stijn 2 年之前
父節點
當前提交
7624f8aeb1
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      daemon/logger/journald/read.go

+ 2 - 1
daemon/logger/journald/read.go

@@ -227,6 +227,7 @@ func (s *journald) followJournal(logWatcher *logger.LogWatcher, j *C.sd_journal,
 
 
 	waitTimeout := C.uint64_t(250000) // 0.25s
 	waitTimeout := C.uint64_t(250000) // 0.25s
 
 
+LOOP:
 	for {
 	for {
 		status := C.sd_journal_wait(j, waitTimeout)
 		status := C.sd_journal_wait(j, waitTimeout)
 		if status < 0 {
 		if status < 0 {
@@ -235,7 +236,7 @@ func (s *journald) followJournal(logWatcher *logger.LogWatcher, j *C.sd_journal,
 		}
 		}
 		select {
 		select {
 		case <-logWatcher.WatchConsumerGone():
 		case <-logWatcher.WatchConsumerGone():
-			break // won't be able to write anything anymore
+			break LOOP // won't be able to write anything anymore
 		case <-s.closed:
 		case <-s.closed:
 			// container is gone, drain journal
 			// container is gone, drain journal
 		default:
 		default: