From da241e9cbb974d9be808477bd7393896e7f398f9 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Wed, 17 Oct 2018 15:03:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=BB=91=E5=90=8D=E5=8D=95=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E9=85=8D=E7=BD=AE=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/logclient/logclient.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index 655d9ab0cb..066cb0e8ee 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -56,6 +56,9 @@ const ( ACT_VM_UNBIND_KEYPAIR = "解绑密钥" ) +// golang 不支持 const 的string array, http://t.cn/EzAvbw8 +var BLACK_LIST_OBJ_TYPE = []string{"parameter"} + var logclientWorkerMan *appsrv.WorkerManager func init() { @@ -73,7 +76,13 @@ func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcc token := userCred notes := stringutils.Interface2String(iNotes) - // s := auth.GetSession(userCred, "", "") + // 忽略不黑名单里的资源类型 + for _, v := range BLACK_LIST_OBJ_TYPE { + if v == model.Keyword() { + log.Errorf("不支持的 actionlog 类型") + return + } + } objId := model.GetId() if len(objId) == 0 { From 1736eacb2157825a5c91daed4d977b26f18d6d92 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Wed, 17 Oct 2018 16:18:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=A6=E5=AE=BD=20task?= =?UTF-8?q?:=20CLOUD-561=E4=BA=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=B8=A6=E5=AE=BD=E5=90=8E=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/guests.go | 7 ++++++- pkg/util/logclient/logclient.go | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 2972098f76..ca7344983f 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -2886,10 +2886,12 @@ func (self *SGuest) PerformChangeBandwidth(ctx context.Context, userCred mcclien guestnics := self.GetNetworks() index, err := data.Int("index") if err != nil || index > int64(len(guestnics)) { + logclient.AddActionLog(self, logclient.ACT_VM_CHANGE_BANDWIDTH, "Index Not fount or out of NIC index", userCred, false) return nil, httperrors.NewBadRequestError("Index Not fount or out of NIC index") } bandwidth, err := data.Int("bandwidth") if err != nil || bandwidth <= 0 { + logclient.AddActionLog(self, logclient.ACT_VM_CHANGE_BANDWIDTH, "Bandwidth must be larger than 0", userCred, false) return nil, httperrors.NewBadRequestError("Bandwidth must be larger than 0") } guestnic := &guestnics[index] @@ -2899,11 +2901,14 @@ func (self *SGuest) PerformChangeBandwidth(ctx context.Context, userCred mcclien return nil }) err := self.StartSyncTask(ctx, userCred, false, "") + logclient.AddActionLog(self, logclient.ACT_VM_CHANGE_BANDWIDTH, err, userCred, err == nil) return nil, err } return nil, nil } - return nil, httperrors.NewBadRequestError("Cannot change bandwidth in status %s", self.Status) + msg := fmt.Sprintf("Cannot change bandwidth in status %s", self.Status) + logclient.AddActionLog(self, logclient.ACT_VM_CHANGE_BANDWIDTH, msg, userCred, false) + return nil, httperrors.NewBadRequestError(msg) } func (self *SGuest) AllowPerformChangeConfig(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool { diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index 066cb0e8ee..0d8a541788 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -48,6 +48,7 @@ const ( ACT_VM_PURGE = "清除" ACT_VM_REBUILD = "重装系统" ACT_VM_RESET_PSWD = "重置密码" + ACT_VM_CHANGE_BANDWIDTH = "调整带宽" ACT_VM_START = "开机" ACT_VM_STOP = "关机" ACT_VM_RESTART = "重启"