Skip to content

OCPBUGS-74243: Fixup double printing process logs #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 21, 2026
+3 −6
Merged

OCPBUGS-74243: Fixup double printing process logs #536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,18 +965,15 @@ func (p *ptpProcess) cmdRun(stdoutToSocket bool, pm *plugin.PluginManager) {

for scanner.Scan() {
output := scanner.Text()

if regexErr != nil || !logFilterRegex.MatchString(output) {
fmt.Printf("%s\n", output)
}
if p.name == chronydProcessName {
output = fmt.Sprintf("%s[%d]%s: %s", chronydProcessName, p.cmd.Process.Pid, p.messageTag, output)
}
output = pm.ProcessLog(p.name, output)
fmt.Printf("%s\n", output)
// for ts2phc from 4.2 onwards replace /dev/ptpX by actual interface name
output = fmt.Sprintf("%s\n", p.replaceClockID(output))
// for ts2phc, we need to extract metrics to identify GM state
if regexErr != nil || !logFilterRegex.MatchString(output) {
fmt.Printf("%s\n", output)
}
p.processPTPMetrics(output)
if p.name == ptp4lProcessName {
if strings.Contains(output, ClockClassChangeIndicator) {
Expand Down