diff --git a/main.go b/main.go index b72f965..4fe4ccd 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,6 @@ import ( "github.com/robfig/cron/v3" util_http "github.com/IceWhaleTech/CasaOS-Common/utils/http" - "github.com/IceWhaleTech/CasaOS-Installer/codegen/message_bus" "github.com/IceWhaleTech/CasaOS-Installer/common" "github.com/IceWhaleTech/CasaOS-Installer/internal/config" @@ -140,7 +139,6 @@ func main() { } go registerRouter(listener) - go registerMsg() // should do before cron job to prevent stop by `installing` status err = service.InstallerService.PostMigration(sysRoot) @@ -215,27 +213,6 @@ func watchOfflineDir(watcher *fsnotify.Watcher) { } } -func registerMsg() { - var messageBus *message_bus.ClientWithResponses - var err error - for i := 0; i < 10; i++ { - if messageBus, err = service.MyService.MessageBus(); err != nil { - logger.Error("error when trying to connect to message bus... skipping", zap.Error(err)) - continue - } - response, err := messageBus.RegisterEventTypesWithResponse(context.Background(), common.EventTypes) - if err != nil { - logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.Error(err)) - continue - } - if response != nil && response.StatusCode() != http.StatusOK { - logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.String("status", response.Status()), zap.String("body", string(response.Body))) - continue - } - time.Sleep(3 * time.Second) - } -} - func registerRouter(listener net.Listener) { for i := 0; i < 10; i++ { // initialize routers and register at gateway diff --git a/service/status_serivce.go b/service/status_serivce.go index 4785ceb..3664a91 100644 --- a/service/status_serivce.go +++ b/service/status_serivce.go @@ -83,7 +83,15 @@ func NewStatusService(implementService UpdaterServiceInterface, sysRoot string) statusService.status = codegen.Status{ Status: codegen.Idle, } - statusService.release, _ = implementService.GetRelease(context.Background(), GetReleaseBranch(sysRoot), true) + + go func() { + release, err := implementService.GetRelease(context.Background(), GetReleaseBranch(sysRoot), true) + if err != nil { + logger.Error("fail get release", zap.Error(err)) + } else { + statusService.release = release + } + }() return statusService }