From 5a836534f5f4116c6ea220147774619859ea6e5a Mon Sep 17 00:00:00 2001 From: Akihiro TAKASE <42milez@gmail.com> Date: Fri, 29 Oct 2021 23:05:17 +0900 Subject: [PATCH] writes to "os.Stderr" with fmt.Fprintf() --- src/datachannel/streaming.go | 6 +++--- src/sessionmanagerplugin-main/main.go | 2 +- .../session/portsession/basicportforwarding.go | 2 +- .../session/portsession/muxportforwarding.go | 2 +- src/sessionmanagerplugin/session/session.go | 2 +- src/sessionmanagerplugin/session/sessionhandler.go | 2 +- .../session/sessionutil/sessionutil_windows.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/datachannel/streaming.go b/src/datachannel/streaming.go index a6b122d4..3effe1ec 100644 --- a/src/datachannel/streaming.go +++ b/src/datachannel/streaming.go @@ -495,7 +495,7 @@ func (dataChannel *DataChannel) handleHandshakeComplete(log log.T, clientMessage handshakeComplete.HandshakeTimeToComplete.Seconds()) if handshakeComplete.CustomerMessage != "" { - fmt.Fprintln(os.Stdout, handshakeComplete.CustomerMessage) + fmt.Fprintln(os.Stderr, handshakeComplete.CustomerMessage) } return err @@ -763,9 +763,9 @@ func (dataChannel DataChannel) HandleChannelClosedMessage(log log.T, stopHandler log.Infof("Exiting session with sessionId: %s with output: %s", sessionId, channelClosedMessage.Output) if channelClosedMessage.Output == "" { - fmt.Fprintf(os.Stdout, "\n\nExiting session with sessionId: %s.\n\n", sessionId) + fmt.Fprintf(os.Stderr, "\n\nExiting session with sessionId: %s.\n\n", sessionId) } else { - fmt.Fprintf(os.Stdout, "\n\nSessionId: %s : %s\n\n", sessionId, channelClosedMessage.Output) + fmt.Fprintf(os.Stderr, "\n\nSessionId: %s : %s\n\n", sessionId, channelClosedMessage.Output) } stopHandler() diff --git a/src/sessionmanagerplugin-main/main.go b/src/sessionmanagerplugin-main/main.go index 825c81b7..ef0a00ae 100644 --- a/src/sessionmanagerplugin-main/main.go +++ b/src/sessionmanagerplugin-main/main.go @@ -23,5 +23,5 @@ import ( ) func main() { - session.ValidateInputAndStartSession(os.Args, os.Stdout) + session.ValidateInputAndStartSession(os.Args, os.Stderr) } diff --git a/src/sessionmanagerplugin/session/portsession/basicportforwarding.go b/src/sessionmanagerplugin/session/portsession/basicportforwarding.go index 95b91d81..4dde0b12 100644 --- a/src/sessionmanagerplugin/session/portsession/basicportforwarding.go +++ b/src/sessionmanagerplugin/session/portsession/basicportforwarding.go @@ -175,7 +175,7 @@ func (p *BasicPortForwarding) handleControlSignals(log log.T) { if err := p.session.DataChannel.SendFlag(log, message.TerminateSession); err != nil { log.Errorf("Failed to send TerminateSession flag: %v", err) } - fmt.Fprintf(os.Stdout, "\n\nExiting session with sessionId: %s.\n\n", p.sessionId) + fmt.Fprintf(os.Stderr, "\n\nExiting session with sessionId: %s.\n\n", p.sessionId) p.Stop() } else { p.session.TerminateSession(log) diff --git a/src/sessionmanagerplugin/session/portsession/muxportforwarding.go b/src/sessionmanagerplugin/session/portsession/muxportforwarding.go index f5a03372..6030e3ee 100644 --- a/src/sessionmanagerplugin/session/portsession/muxportforwarding.go +++ b/src/sessionmanagerplugin/session/portsession/muxportforwarding.go @@ -187,7 +187,7 @@ func (p *MuxPortForwarding) handleControlSignals(log log.T) { if err := p.session.DataChannel.SendFlag(log, message.TerminateSession); err != nil { log.Errorf("Failed to send TerminateSession flag: %v", err) } - fmt.Fprintf(os.Stdout, "\n\nExiting session with sessionId: %s.\n\n", p.sessionId) + fmt.Fprintf(os.Stderr, "\n\nExiting session with sessionId: %s.\n\n", p.sessionId) p.Stop() }() } diff --git a/src/sessionmanagerplugin/session/session.go b/src/sessionmanagerplugin/session/session.go index e9a41117..0937757b 100644 --- a/src/sessionmanagerplugin/session/session.go +++ b/src/sessionmanagerplugin/session/session.go @@ -190,7 +190,7 @@ func ValidateInputAndStartSession(args []string, out io.Writer) { //Execute create data channel and start the session func (s *Session) Execute(log log.T) (err error) { - fmt.Fprintf(os.Stdout, "\nStarting session with SessionId: %s\n", s.SessionId) + fmt.Fprintf(os.Stderr, "\nStarting session with SessionId: %s\n", s.SessionId) // sets the display mode s.DisplayMode = sessionutil.NewDisplayMode(log) diff --git a/src/sessionmanagerplugin/session/sessionhandler.go b/src/sessionmanagerplugin/session/sessionhandler.go index c3106ae0..56309801 100644 --- a/src/sessionmanagerplugin/session/sessionhandler.go +++ b/src/sessionmanagerplugin/session/sessionhandler.go @@ -129,7 +129,7 @@ func (s *Session) ResumeSessionHandler(log log.T) (err error) { return } else if s.TokenValue == "" { log.Debugf("Session: %s timed out", s.SessionId) - fmt.Fprintf(os.Stdout, "Session: %s timed out.\n", s.SessionId) + fmt.Fprintf(os.Stderr, "Session: %s timed out.\n", s.SessionId) os.Exit(0) } s.DataChannel.GetWsChannel().SetChannelToken(s.TokenValue) diff --git a/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go b/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go index 50b0df42..d96bd5e4 100644 --- a/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go +++ b/src/sessionmanagerplugin/session/sessionutil/sessionutil_windows.go @@ -70,7 +70,7 @@ func (d *DisplayMode) DisplayMessage(log log.T, message message.ClientMessage) { // refer - https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-writefile if err = windows.WriteFile(d.handle, message.Payload, done, nil); err != nil { log.Errorf("error occurred while writing to file: %v", err) - fmt.Fprintf(os.Stdout, "\nError getting the output. %s\n", err.Error()) + fmt.Fprintf(os.Stderr, "\nError getting the output. %s\n", err.Error()) os.Exit(0) } }