Merge pull request #1222 from ersonp/fix/vpn-reconnecting-status

Fix vpn reconnecting status
skycoin · May 25, 2022 · cd14ca2 · cd14ca2
2 parents 76f20b0 + 2c2009b
commit cd14ca2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/pkg/app/launcher/app_state.go b/pkg/app/launcher/app_state.go
@@ -15,9 +15,6 @@ const (
 
 	// AppStatusStarting represents status of an app starting.
 	AppStatusStarting
-
-	// AppStatusReconnecting represents status of VPN client re-connecting.
-	AppStatusReconnecting
 )
 
 // AppState defines state parameters for a registered App.
@@ -34,15 +31,15 @@ const (
 	// AppDetailedStatusStarting is set during app initilization process.
 	AppDetailedStatusStarting = "Starting"
 
+	// AppDetailedStatusRunning is set when the app is running.
+	AppDetailedStatusRunning = "Running"
+
 	// AppDetailedStatusVPNConnecting is set during VPN-client session establishment (including handshake).
 	AppDetailedStatusVPNConnecting = "Connecting"
 
-	// AppDetailedStatusRunning is set when all establishment is done and / or app is running.
-	AppDetailedStatusRunning = "Running"
+	// AppDetailedStatusVPNReconnecting is set after connection failure in VPN-client, during reconnection.
+	AppDetailedStatusVPNReconnecting = "Connection failed, reconnecting"
 
 	// AppDetailedStatusShuttingDown is set during shutdown.
 	AppDetailedStatusShuttingDown = "Shutting down"
-
-	// AppDetailedStatusVPNReconnecting is set after connection failure in VPN-client, during reconnection.
-	AppDetailedStatusVPNReconnecting = "Connection failed, reconnecting"
 )
diff --git a/pkg/app/launcher/launcher.go b/pkg/app/launcher/launcher.go
@@ -190,7 +190,8 @@ func (l *Launcher) AppState(name string) (*AppState, bool) {
 			state.DetailedStatus = AppDetailedStatusStarting
 			state.Status = AppStatusStarting
 		}
-		if state.DetailedStatus == AppDetailedStatusVPNConnecting || state.DetailedStatus == AppDetailedStatusStarting {
+		switch state.DetailedStatus {
+		case AppDetailedStatusVPNConnecting, AppDetailedStatusStarting, AppDetailedStatusVPNReconnecting:
 			state.Status = AppStatusStarting
 		}
 	}