Merge pull request #1260 from hakman/kmsg-stop-parser

k8s-ci-robot · web-flow · commit e0a3f5bfe58a · 2026-04-10T22:56:21.000+05:30
fix(logwatchers/kmsg): don't close parser from Stop()
diff --git a/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux.go b/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux.go
@@ -80,11 +80,8 @@ func (k *kernelLogWatcher) Watch() (<-chan *logtypes.Log, error) {
 	return k.logCh, nil
 }
 
-// Stop closes the kmsgparser
+// Stop signals the watch loop to stop.
 func (k *kernelLogWatcher) Stop() {
-	if err := k.kmsgParser.Close(); err != nil {
-		klog.Errorf("Failed to close kmsg parser: %v", err)
-	}
 	k.tomb.Stop()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,8 @@ func (k kernelLogWatcher) Watch() (<-chan logtypes.Log, error) {`
`80`	`80`	`return k.logCh, nil`
`81`	`81`	`}`
`82`	`82`
`83`		`-// Stop closes the kmsgparser`
	`83`	`+// Stop signals the watch loop to stop.`
`84`	`84`	`func (k *kernelLogWatcher) Stop() {`
`85`		`- if err := k.kmsgParser.Close(); err != nil {`
`86`		`- klog.Errorf("Failed to close kmsg parser: %v", err)`
`87`		`- }`
`88`	`85`	`k.tomb.Stop()`
`89`	`86`	`}`
`90`	`87`