Merge pull request #10 from pelican-dev/push_notifications

Refactoring of PushServerStateChange
pelican-dev · Apr 20, 2024 · aa9795b · aa9795b
2 parents 0f6cd30 + 181b405
commit aa9795b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/remote/http.go b/remote/http.go
@@ -33,7 +33,7 @@ type Client interface {
 	SetTransferStatus(ctx context.Context, uuid string, successful bool) error
 	ValidateSftpCredentials(ctx context.Context, request SftpAuthRequest) (SftpAuthResponse, error)
 	SendActivityLogs(ctx context.Context, activity []models.Activity) error
-	PushServerStateChange(ctx context.Context, stateChange ServerStateChange) error
+	PushServerStateChange(ctx context.Context, sid string, stateChange ServerStateChange) error
 }
 
 type client struct {

diff --git a/remote/servers.go b/remote/servers.go
@@ -213,8 +213,8 @@ func (c *client) getServersPaged(ctx context.Context, page, limit int) ([]RawSer
 }
 
 // PushServerStateChange updates the Panel with state change notifications
-func (c *client) PushServerStateChange(ctx context.Context, sc ServerStateChange) error {
-	resp, err := c.Post(ctx, fmt.Sprintf("/api/remote/servers/%s/container/status", sc.ServerUuid), d{"data": sc})
+func (c *client) PushServerStateChange(ctx context.Context, sid string, sc ServerStateChange) error {
+	resp, err := c.Post(ctx, fmt.Sprintf("/api/remote/servers/%s/container/status", sid), d{"data": sc})
 	if err != nil {
 		return errors.WithStackIf(err)
 	}

diff --git a/remote/types.go b/remote/types.go
@@ -176,7 +176,6 @@ type InstallStatusRequest struct {
 }
 
 type ServerStateChange struct {
-	PrevState  string `json:"previous_state"`
-	NewState   string `json:"new_state"`
-	ServerUuid string `json:"server_uuid"`
+	PrevState string `json:"previous_state"`
+	NewState  string `json:"new_state"`
 }
diff --git a/server/server.go b/server/server.go
@@ -324,8 +324,9 @@ func (s *Server) OnStateChange() {
 	}
 
 	// Push status update to Panel
-	s.Log().Debug("pushing server status change to panel")
-	go s.client.PushServerStateChange(s.Context(), remote.ServerStateChange{prevState, st, s.ID()})
+	sc := remote.ServerStateChange{prevState, st}
+	s.Log().WithField("state_change", sc).Debug("pushing server status change to panel")
+	s.client.PushServerStateChange(context.Background(), s.ID(), sc)
 
 	// Reset the resource usage to 0 when the process fully stops so that all the UI
 	// views in the Panel correctly display 0.