From 83b6855d86c8cae8462b5aaca70e56772030bad1 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Mon, 14 Jan 2019 17:25:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=82=E8=BD=BD=E7=A3=81?= =?UTF-8?q?=E7=9B=98=E3=80=81=E5=8D=B8=E8=BD=BD=E7=A3=81=E7=9B=98=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/tasks/guest_attach_disk_task.go | 3 +++ pkg/compute/tasks/guest_detach_disk_task.go | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/compute/tasks/guest_attach_disk_task.go b/pkg/compute/tasks/guest_attach_disk_task.go index 842ee0317f..3f0188141c 100644 --- a/pkg/compute/tasks/guest_attach_disk_task.go +++ b/pkg/compute/tasks/guest_attach_disk_task.go @@ -10,6 +10,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/util/logclient" ) type GuestAttachDiskTask struct { @@ -62,6 +63,7 @@ func (self *GuestAttachDiskTask) OnSyncConfigComplete(ctx context.Context, guest } disk.SetStatus(self.UserCred, models.DISK_READY, "") self.SetStageComplete(ctx, nil) + logclient.AddActionLog(guest, logclient.ACT_VM_ATTACH_DISK, nil, self.UserCred, true) } func (self *GuestAttachDiskTask) OnSyncConfigCompleteFailed(ctx context.Context, obj db.IStandaloneModel, resion jsonutils.JSONObject) { @@ -86,4 +88,5 @@ func (self *GuestAttachDiskTask) OnTaskFail(ctx context.Context, guest *models.S guest.SetStatus(self.UserCred, models.VM_ATTACH_DISK_FAILED, err.Error()) self.SetStageFailed(ctx, err.Error()) log.Errorf("Guest %s GuestAttachDiskTask failed %s", guest.Name, err.Error()) + logclient.AddActionLog(guest, logclient.ACT_VM_ATTACH_DISK, err.Error(), self.UserCred, false) } diff --git a/pkg/compute/tasks/guest_detach_disk_task.go b/pkg/compute/tasks/guest_detach_disk_task.go index d68ba87ff8..ffebe904aa 100644 --- a/pkg/compute/tasks/guest_detach_disk_task.go +++ b/pkg/compute/tasks/guest_detach_disk_task.go @@ -6,11 +6,12 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/util/logclient" + "yunion.io/x/pkg/utils" ) type GuestDetachDiskTask struct { @@ -91,6 +92,7 @@ func (self *GuestDetachDiskTask) OnSyncConfigComplete(ctx context.Context, guest } else { self.SetStageComplete(ctx, nil) } + logclient.AddActionLog(guest, logclient.ACT_VM_DETACH_DISK, nil, self.UserCred, true) } func (self *GuestDetachDiskTask) OnSyncConfigCompleteFailed(ctx context.Context, obj db.IStandaloneModel, resion jsonutils.JSONObject) { @@ -121,6 +123,7 @@ func (self *GuestDetachDiskTask) OnTaskFail(ctx context.Context, guest *models.S guest.SetStatus(self.UserCred, models.VM_DETACH_DISK_FAILED, err.Error()) self.SetStageFailed(ctx, err.Error()) log.Errorf("Guest %s GuestDetachDiskTask failed %s", guest.Id, err.Error()) + logclient.AddActionLog(guest, logclient.ACT_VM_DETACH_DISK, err.Error(), self.UserCred, false) } func (self *GuestDetachDiskTask) OnDiskDeleteComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {