Merge pull request #1141 from mrpalide/fix/improve-vpn-app-status

Set Status=3 for Connecting of VPN-Client App
skycoin · Apr 6, 2022 · 21cd90d · 21cd90d
2 parents 4aa8295 + cca6c0f
commit 21cd90d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/app/launcher/app_state.go b/pkg/app/launcher/app_state.go
@@ -12,6 +12,9 @@ const (
 
 	// AppStatusErrored represents status of an errored App.
 	AppStatusErrored
+
+	// AppVPNClientConnecting represents status of VPN client connecting.
+	AppVPNClientConnecting
 )
 
 // AppState defines state parameters for a registered App.

diff --git a/pkg/app/launcher/launcher.go b/pkg/app/launcher/launcher.go
@@ -16,6 +16,7 @@ import (
 	"github.com/skycoin/dmsg/pkg/dmsg"
 
 	"github.com/skycoin/skywire-utilities/pkg/cipher"
+	"github.com/skycoin/skywire/internal/vpn"
 	"github.com/skycoin/skywire/pkg/app/appcommon"
 	"github.com/skycoin/skywire/pkg/app/appnet"
 	"github.com/skycoin/skywire/pkg/app/appserver"
@@ -202,6 +203,9 @@ func (l *Launcher) AppStates() []*AppState {
 			if connSummary != nil {
 				state.Status = AppStatusRunning
 			}
+			if state.DetailedStatus == vpn.ClientStatusConnecting {
+				state.Status = AppVPNClientConnecting
+			}
 		}
 		states = append(states, state)
 	}