Skip to content
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

Jump to bottom

Bugfix: Close session properly if activation failed #657

Merged
merged 3 commits into from
Jun 5, 2023
Merged

Bugfix: Close session properly if activation failed #657

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7edbd31
setSession if activate failes to close it properly
Maddin-619 Jun 1, 2023
096fb15
make closing of session explicit
magiconair Jun 5, 2023
e7fe39b
Use WithContext method
magiconair Jun 5, 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
3 changes: 2 additions & 1 deletion client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ func (c *Client) Connect(ctx context.Context) error {
}

if err := c.ActivateSessionWithContext(ctx, s); err != nil {
c.closeSession(ctx, s) // ignore error since we cannot handle it anyway
c.CloseWithContext(ctx)
stats.RecordError(err)

Expand Down Expand Up @@ -888,7 +889,7 @@ func (c *Client) ActivateSessionWithContext(ctx context.Context, s *Session) err
// We decided not to check the error of CloseSession() since we
// can't do much about it anyway and it creates a race in the
// re-connection logic.
c.CloseSession()
c.CloseSessionWithContext(ctx)

c.setSession(s)
return nil
Expand Down