From e0f1793f287bed426f7ce4d362068abfa0df6bdc Mon Sep 17 00:00:00 2001 From: Joseph Richard Date: Wed, 21 Jan 2026 10:35:37 -0700 Subject: [PATCH] Fixup double printing process logs --- pkg/daemon/daemon.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go index 3186dcc8..0635a365 100644 --- a/pkg/daemon/daemon.go +++ b/pkg/daemon/daemon.go @@ -960,6 +960,10 @@ func (p *ptpProcess) cmdRun(stdoutToSocket bool, pm *plugin.PluginManager) { go func() { for scanner.Scan() { output := scanner.Text() + 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) if regexErr != nil || !logFilterRegex.MatchString(output) { fmt.Printf("%s\n", output) } @@ -1037,18 +1041,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) {