From b3c8cf6cd7e3dd27c0821a520b95b414c9648d39 Mon Sep 17 00:00:00 2001 From: rainzm Date: Thu, 13 May 2021 17:38:15 +0800 Subject: [PATCH] fix(region): use the previous method for guest notification instead of message subscription --- pkg/compute/tasks/guest_create_task.go | 8 +++++++- pkg/compute/tasks/guest_delete_task.go | 12 +++++++++++- pkg/compute/tasks/guest_rebuild_root_task.go | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/pkg/compute/tasks/guest_create_task.go b/pkg/compute/tasks/guest_create_task.go index 48189e399b..1f4b170edd 100644 --- a/pkg/compute/tasks/guest_create_task.go +++ b/pkg/compute/tasks/guest_create_task.go @@ -28,6 +28,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudcommon/notifyclient" "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/mcclient/modules/notify" "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/onecloud/pkg/util/logclient" ) @@ -160,7 +161,12 @@ func (self *GuestCreateTask) OnDeployGuestDescComplete(ctx context.Context, obj func (self *GuestCreateTask) notifyServerCreated(ctx context.Context, guest *models.SGuest) { notifyclient.NotifyWebhook(ctx, self.UserCred, guest, notifyclient.ActionCreate) - guest.EventNotify(ctx, self.UserCred, notifyclient.ActionCreate) + guest.NotifyServerEvent( + ctx, self.UserCred, notifyclient.SERVER_CREATED, + notify.NotifyPriorityImportant, true, nil, false, + ) + guest.NotifyAdminServerEvent(ctx, notifyclient.SERVER_CREATED_ADMIN, notify.NotifyPriorityImportant) + // guest.EventNotify(ctx, self.UserCred, notifyclient.ActionCreate) } func (self *GuestCreateTask) OnDeployGuestDescCompleteFailed(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/guest_delete_task.go b/pkg/compute/tasks/guest_delete_task.go index 1d8d34fc82..ab9c44d8b9 100644 --- a/pkg/compute/tasks/guest_delete_task.go +++ b/pkg/compute/tasks/guest_delete_task.go @@ -28,6 +28,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/notifyclient" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/mcclient/modules/notify" "yunion.io/x/onecloud/pkg/util/logclient" ) @@ -353,5 +354,14 @@ func (self *GuestDeleteTask) DeleteGuest(ctx context.Context, guest *models.SGue } func (self *GuestDeleteTask) NotifyServerDeleted(ctx context.Context, guest *models.SGuest) { - guest.EventNotify(ctx, self.UserCred, notifyclient.ActionPendingDelete) + notifyclient.NotifyWebhook(ctx, self.UserCred, guest, notifyclient.ActionPendingDelete) + guest.NotifyServerEvent( + ctx, + self.UserCred, + notifyclient.SERVER_DELETED, + notify.NotifyPriorityImportant, + false, nil, false, + ) + guest.NotifyAdminServerEvent(ctx, notifyclient.SERVER_DELETED_ADMIN, notify.NotifyPriorityImportant) + // guest.EventNotify(ctx, self.UserCred, notifyclient.ActionPendingDelete) } diff --git a/pkg/compute/tasks/guest_rebuild_root_task.go b/pkg/compute/tasks/guest_rebuild_root_task.go index 4c09de9972..a6e2431feb 100644 --- a/pkg/compute/tasks/guest_rebuild_root_task.go +++ b/pkg/compute/tasks/guest_rebuild_root_task.go @@ -27,6 +27,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudcommon/notifyclient" "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/mcclient/modules/notify" "yunion.io/x/onecloud/pkg/util/logclient" ) @@ -176,7 +177,14 @@ func (self *GuestRebuildRootTask) OnRebuildAllDisksComplete(ctx context.Context, } db.OpsLog.LogEvent(guest, db.ACT_REBUILD_ROOT, "", self.UserCred) notifyclient.NotifyWebhook(ctx, self.UserCred, guest, notifyclient.ActionRebuildRoot) - guest.EventNotify(ctx, self.UserCred, notifyclient.ActionRebuildRoot) + guest.NotifyServerEvent( + ctx, + self.UserCred, + notifyclient.SERVER_REBUILD_ROOT, + notify.NotifyPriorityImportant, + true, nil, false, + ) + // guest.EventNotify(ctx, self.UserCred, notifyclient.ActionRebuildRoot) self.SetStage("OnSyncStatusComplete", nil) guest.StartSyncstatus(ctx, self.UserCred, self.GetTaskId()) }