Skip to content

Test rebase fork #124

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

Open
didiermichel wants to merge 3 commits into
base: mainline
Choose a base branch
from
Open

Test rebase fork #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf0c6ae
Enable KeepAlive for mux port forwarding
junze-smg Nov 6, 2023
21f1143
Adjust log level and remove fmt.Printf
junze-smg Dec 19, 2023
d37ff3c
Remove more fmt.Println logs
junze-smg Dec 19, 2023
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
2 changes: 0 additions & 2 deletions src/sessionmanagerplugin/session/portsession/basicportforwarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ func (p *BasicPortForwarding) startLocalConn(log log.T) (err error) {
return err
}
log.Infof("Connection accepted for session %s.", p.sessionId)
fmt.Printf("Connection accepted for session %s.\n", p.sessionId)

p.listener = &listener
p.stream = &tcpConn
Expand All @@ -159,7 +158,6 @@ func (p *BasicPortForwarding) startLocalListener(log log.T, portNumber string) (
}

log.Info(displayMessage)
fmt.Println(displayMessage)
return
}

Expand Down
4 changes: 1 addition & 3 deletions src/sessionmanagerplugin/session/portsession/muxportforwarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (p *MuxPortForwarding) initialize(log log.T, agentVersion string) (err erro
smuxConfig := smux.DefaultConfig()
if version.DoesAgentSupportDisableSmuxKeepAlive(log, agentVersion) {
// Disable smux KeepAlive or else it breaks Session Manager idle timeout.
smuxConfig.KeepAliveDisabled = true
smuxConfig.KeepAliveDisabled = false
}
if muxSession, err := smux.Client(muxConn, smuxConfig); err != nil {
return err
Expand Down Expand Up @@ -252,10 +252,8 @@ func (p *MuxPortForwarding) handleClientConnections(log log.T, ctx context.Conte
defer listener.Close()

log.Infof(displayMsg)
fmt.Printf(displayMsg)

log.Infof("Waiting for connections...\n")
fmt.Printf("\nWaiting for connections...\n")

var once sync.Once
for {
Expand Down
2 changes: 1 addition & 1 deletion src/sessionmanagerplugin/session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,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)
log.Infof("\nStarting session with SessionId: %s\n", s.SessionId)

// sets the display mode
s.DisplayMode = sessionutil.NewDisplayMode(log)
Expand Down