From d2cf661e547cbf901d2d643f0ff29c2f205d599a Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 22 Dec 2017 21:35:42 +0100 Subject: Fixed reported error and logging. --- golib/eows/eows-out.go | 8 ++++---- golib/eows/eows-signal.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/golib/eows/eows-out.go b/golib/eows/eows-out.go index 2a6b110..6f6706c 100644 --- a/golib/eows/eows-out.go +++ b/golib/eows/eows-out.go @@ -24,13 +24,13 @@ func (e *ExecOverWS) cmdPumpStdout(r io.Reader, done chan struct{}) { // else use default sc.ScanLines if e.OutSplit == SplitChar { - sc.Split(scanBlocks) + sc.Split(scanBlocks) } for sc.Scan() { e.OutputCB(e, sc.Text(), "") } - if sc.Err() != nil { + if sc.Err() != nil && !strings.Contains(sc.Err().Error(), "file already closed") { e.logError("stdout scan: %v", sc.Err()) } @@ -46,13 +46,13 @@ func (e *ExecOverWS) cmdPumpStderr(r io.Reader) { // else use default sc.ScanLines if e.OutSplit == SplitChar { - sc.Split(scanBlocks) + sc.Split(scanBlocks) } for sc.Scan() { e.OutputCB(e, "", sc.Text()) } - if sc.Err() != nil { + if sc.Err() != nil && !strings.Contains(sc.Err().Error(), "file already closed") { e.logError("stderr scan: %v", sc.Err()) } } diff --git a/golib/eows/eows-signal.go b/golib/eows/eows-signal.go index 5db5366..f48279a 100644 --- a/golib/eows/eows-signal.go +++ b/golib/eows/eows-signal.go @@ -43,6 +43,6 @@ func (e *ExecOverWS) Signal(signal string) error { return fmt.Errorf("Cannot retrieve process") } - fmt.Printf("SEND signal %v to proc %v\n", sig, e.proc.Pid) + e.logDebug("SEND signal %v to proc %v", sig, e.proc.Pid) return e.proc.Signal(sig) } -- cgit 1.2.3-korg