try add value from to message

beclab · Jul 17, 2024 · 750a7e6 · 750a7e6
1 parent c98c329
commit 750a7e6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/internal/watchdog/dog.go b/internal/watchdog/dog.go
@@ -3,14 +3,15 @@ package watchdog
 import (
 	"context"
 	"fmt"
-	"github.com/golang/glog"
 	"market/internal/appservice"
 	"market/internal/constants"
 	"market/internal/event"
 	"market/internal/models"
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/golang/glog"
 )
 
 type CommonWatchDog struct {
@@ -238,7 +239,7 @@ func (i *CommonWatchDog) updateStatus(status, progress, op, msg string) {
 		return
 	}
 
-	GetStatusManager().UpdateModelInstallStatus(i.uid, status, progress, op, msg)
+	GetStatusManager().UpdateModelInstallStatus(i.uid, status, progress, op, msg, i.from)
 
 	i.status, i.progress = status, progress
 }

diff --git a/internal/watchdog/event.go b/internal/watchdog/event.go
@@ -7,6 +7,7 @@ import (
 	"market/internal/appservice"
 	"market/internal/constants"
 	"market/internal/event"
+
 	//"market/internal/helm"
 	"market/internal/models"
 	"sync"
@@ -452,7 +453,7 @@ func (i *InstallationWatchDog) updateStatus(status, progress, op, msg string) {
 		return
 	}
 
-	GetStatusManager().UpdateInstallStatus(i.uid, status, progress, op, msg)
+	GetStatusManager().UpdateInstallStatus(i.uid, status, progress, op, msg, i.from)
 
 	i.status, i.progress = status, progress
 }

diff --git a/internal/watchdog/status_manager.go b/internal/watchdog/status_manager.go
@@ -20,6 +20,7 @@ type InstallOrUpgradeStatus struct {
 	Status   string `json:"status"`
 	Msg      string `json:"message"`
 	Progress string `json:"progress,omitempty"`
+	From     string `json:"from"`
 }
 
 var once sync.Once
@@ -37,20 +38,20 @@ func GetStatusManager() *StatusManager {
 	return StatusManagerSvc
 }
 
-func (s *StatusManager) UpdateInstallStatus(uid, status, progress, ty, msg string) {
-	s.broadcastStatus(uid, status, progress, msg, ty)
+func (s *StatusManager) UpdateInstallStatus(uid, status, progress, ty, msg string, from string) {
+	s.broadcastStatus(uid, status, progress, msg, ty, from)
 }
 
-func (s *StatusManager) UpdateUpgradeStatus(uid, status, ty, msg string) {
-	s.broadcastStatus(uid, status, "", msg, ty)
+func (s *StatusManager) UpdateUpgradeStatus(uid, status, ty, msg string, from string) {
+	s.broadcastStatus(uid, status, "", msg, ty, from)
 }
 
-func (s *StatusManager) UpdateModelInstallStatus(uid, status, progress, ty, msg string) {
-	s.broadcastStatus(uid, status, progress, msg, ty)
+func (s *StatusManager) UpdateModelInstallStatus(uid, status, progress, ty, msg string, from string) {
+	s.broadcastStatus(uid, status, progress, msg, ty, from)
 }
 
 // call when status changed
-func (s *StatusManager) broadcastStatus(uid, status, progress, msg, t string) {
+func (s *StatusManager) broadcastStatus(uid, status, progress, msg, t string, from string) {
 	resp := InstallOrUpgradeResp{
 		Code: 200,
 		Data: InstallOrUpgradeStatus{
@@ -59,6 +60,7 @@ func (s *StatusManager) broadcastStatus(uid, status, progress, msg, t string) {
 			Status:   status,
 			Progress: progress,
 			Msg:      msg,
+			From:     from,
 		},
 	}
 

diff --git a/internal/watchdog/upgrading.go b/internal/watchdog/upgrading.go
@@ -3,12 +3,13 @@ package watchdog
 import (
 	"context"
 	"fmt"
-	"github.com/golang/glog"
 	"market/internal/appservice"
 	"market/internal/event"
 	"market/internal/models"
 	"sync"
 	"time"
+
+	"github.com/golang/glog"
 )
 
 type UpgradeWatchDog struct {
@@ -257,7 +258,7 @@ func (i *UpgradeWatchDog) updateStatus(status, op, msg string) {
 		return
 	}
 
-	GetStatusManager().UpdateUpgradeStatus(i.uid, status, op, msg)
+	GetStatusManager().UpdateUpgradeStatus(i.uid, status, op, msg, i.from)
 
 	i.status = status
 }