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

[v8] Fix background database local proxy termination by SIGINT signal #17066

Merged
merged 3 commits into from
Oct 10, 2022
Merged

[v8] Fix background database local proxy termination by SIGINT signal #17066

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1640d40
[v8] Fix background database local proxy termination by SIGINT signal
smallinsky Oct 5, 2022
5a08522
Merge branch 'branch/v8' into smallinsky/v8/fix_bacground_db_local_pr…
smallinsky Oct 7, 2022
df6c2fc
Merge branch 'branch/v8' into smallinsky/v8/fix_bacground_db_local_pr…
smallinsky Oct 10, 2022
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
6 changes: 5 additions & 1 deletion tool/tsh/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package main

import (
"context"
"crypto/tls"
"fmt"
"net"
Expand Down Expand Up @@ -189,7 +190,10 @@ func onProxyCommandDB(cf *CLIConf) error {
}

defer lp.Close()
if err := lp.Start(cf.Context); err != nil {
// To avoid termination of background DB teleport proxy when a SIGINT is received don't use the cf.Context.
ctx, cancel := context.WithCancel(context.Background())
smallinsky marked this conversation as resolved.
Show resolved Hide resolved
defer cancel()
if err := lp.Start(ctx); err != nil {
return trace.Wrap(err)
}
return nil
Expand Down