From adc306b1cc7199c48065c96c1a079dd203c0a516 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Tue, 16 Oct 2018 16:09:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?onecloud=20=E5=A2=9E=E5=8A=A0=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E7=9A=84=20actionlog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/tasks/guest_reset_task.go | 4 ++++ pkg/util/logclient/logclient.go | 1 + 2 files changed, 5 insertions(+) diff --git a/pkg/compute/tasks/guest_reset_task.go b/pkg/compute/tasks/guest_reset_task.go index 242eff6f38..21feade618 100644 --- a/pkg/compute/tasks/guest_reset_task.go +++ b/pkg/compute/tasks/guest_reset_task.go @@ -3,6 +3,8 @@ package tasks import ( "context" + "yunion.io/x/onecloud/pkg/util/logclient" + "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/cloudcommon/db" @@ -43,6 +45,7 @@ func (self *GuestHardResetTask) StopServer(ctx context.Context, guest *models.SG guest.SetStatus(self.UserCred, models.VM_STOPPING, "") self.SetStage("OnServerStopComplete", nil) guest.StartGuestStopTask(ctx, self.UserCred, false, self.GetTaskId()) + logclient.AddActionLog(guest, logclient.ACT_VM_RESTART, `{"is_force": true}`, self.UserCred, true) } func (self *GuestHardResetTask) OnServerStopComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) { @@ -67,4 +70,5 @@ func (self *GuestRestartTask) StopServer(ctx context.Context, guest *models.SGue self.SetStage("OnServerStopComplete", nil) isForce := jsonutils.QueryBoolean(self.Params, "is_force", false) guest.StartGuestStopTask(ctx, self.UserCred, isForce, self.GetTaskId()) + logclient.AddActionLog(guest, logclient.ACT_VM_RESTART, `{"is_force": false}`, self.UserCred, true) } diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index f7898ca1e7..655d9ab0cb 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -50,6 +50,7 @@ const ( ACT_VM_RESET_PSWD = "重置密码" ACT_VM_START = "开机" ACT_VM_STOP = "关机" + ACT_VM_RESTART = "重启" ACT_VM_SYNC_CONF = "同步配置" ACT_VM_SYNC_STATUS = "同步状态" ACT_VM_UNBIND_KEYPAIR = "解绑密钥" From 44f051a9ac80308ea58b58215d2eb83cef97d2fd Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Tue, 16 Oct 2018 16:16:30 +0800 Subject: [PATCH 2/2] fmt --- pkg/compute/tasks/guest_reset_task.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/compute/tasks/guest_reset_task.go b/pkg/compute/tasks/guest_reset_task.go index 21feade618..3f275604f3 100644 --- a/pkg/compute/tasks/guest_reset_task.go +++ b/pkg/compute/tasks/guest_reset_task.go @@ -3,13 +3,11 @@ package tasks import ( "context" - "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/jsonutils" - "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" ) func init() {