extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-03-27 08:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass engine context to management and signal clients (#337)

Browse Source
This commit is contained in:
Misha Bragin 2022-05-27 15:54:51 +02:00 committed by GitHub
parent 1bb504ea78
commit 4088aaf6fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/internal/connect.go
View File

@ -60,8 +60,11 @@ func RunClient(ctx context.Context, config *Config) error {
mgmTlsEnabled = true
}
engineCtx, cancel := context.WithCancel(ctx)
defer cancel()
// connect (just a connection, no stream yet) and login to Management Service to get an initial global Wiretrustee config
mgmClient, loginResp, err := connectToManagement(ctx, config.ManagementURL.Host, myPrivateKey, mgmTlsEnabled)
mgmClient, loginResp, err := connectToManagement(engineCtx, config.ManagementURL.Host, myPrivateKey, mgmTlsEnabled)
if err != nil {
log.Debug(err)
if s, ok := status.FromError(err); ok && s.Code() == codes.PermissionDenied {
@ -73,7 +76,7 @@ func RunClient(ctx context.Context, config *Config) error {
}
// with the global Wiretrustee config in hand connect (just a connection, no stream yet) Signal
signalClient, err := connectToSignal(ctx, loginResp.GetWiretrusteeConfig(), myPrivateKey)
signalClient, err := connectToSignal(engineCtx, loginResp.GetWiretrusteeConfig(), myPrivateKey)
if err != nil {
log.Error(err)
return wrapErr(err)
@ -87,9 +90,6 @@ func RunClient(ctx context.Context, config *Config) error {
return wrapErr(err)
}
engineCtx, cancel := context.WithCancel(ctx)
defer cancel()
engine := NewEngine(engineCtx, cancel, signalClient, mgmClient, engineConfig)
err = engine.Start()
if err != nil {