extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-22 08:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rollback stopping management client within engine stop (#204)

Browse Source 
* start close handler when using console

* don't close management client within engine stop
This commit is contained in:
Maycon Santos 2022-01-25 11:18:01 +01:00 committed by GitHub
parent 0739038d51
commit 98dc5824ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/cmd/up.go
View File

@ -22,11 +22,13 @@ var (
Short: "install, login and start wiretrustee client",
RunE: func(cmd *cobra.Command, args []string) error {
SetFlagsFromEnvVars()
err := loginCmd.RunE(cmd, args)
if err != nil {
return err
}
if logFile == "console" {
SetupCloseHandler()
return runClient()
}

8
client/internal/engine.go
View File

@ -96,13 +96,7 @@ func (e *Engine) Stop() error {
e.syncMsgMux.Lock()
defer e.syncMsgMux.Unlock()
err := e.mgmClient.Close()
if err != nil {
log.Errorf("failed closing engine's management client: %v", err)
return err
}
err = e.removeAllPeers()
err := e.removeAllPeers()
if err != nil {
return err
}

6
client/internal/engine_test.go
View File

@ -351,7 +351,11 @@ func TestEngine_MultiplePeers(t *testing.T) {
// cleanup test
for _, peerEngine := range engines {
errStop := peerEngine.Stop()
errStop := peerEngine.mgmClient.Close()
if errStop != nil {
log.Infoln("got error trying to close management clients from engine: ", errStop)
}
errStop = peerEngine.Stop()
if errStop != nil {
log.Infoln("got error trying to close testing peers engine: ", errStop)
}