From a4db1e57c343ad5713b9e0583605cd3143e5b4ac Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Wed, 12 Sep 2018 21:51:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?logserver=20objid=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/logclient/logclient.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index 82f3e76fd0..1540a579f4 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -2,6 +2,7 @@ package logclient import ( "fmt" + "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" @@ -65,11 +66,15 @@ func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcc notes := stringutils.Interface2String(iNotes) s := auth.GetSession(userCred, "", "") + objId := model.GetId() + if len(objId) == 0 { + objId = "-" + } logentry := jsonutils.NewDict() logentry.Add(jsonutils.NewString(model.GetName()), "obj_name") logentry.Add(jsonutils.NewString(model.Keyword()), "obj_type") - logentry.Add(jsonutils.NewString(model.GetId()), "obj_id") + logentry.Add(jsonutils.NewString(objId), "obj_id") logentry.Add(jsonutils.NewString(action), "action") logentry.Add(jsonutils.NewString(token.GetUserId()), "user_id") logentry.Add(jsonutils.NewString(token.GetUserName()), "user") From 8e2d077f2aa9edd6a4ed45da1c664aef2826388c Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Thu, 13 Sep 2018 06:11:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?logserver=20obj-name=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/logclient/logclient.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index 1540a579f4..b22f85e105 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -64,15 +64,18 @@ func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcc token := userCred notes := stringutils.Interface2String(iNotes) - s := auth.GetSession(userCred, "", "") - objId := model.GetId() + objId := model.GetId() if len(objId) == 0 { objId = "-" } + objName := model.GetName() + if len(objName) == 0 { + objName = "-" + } logentry := jsonutils.NewDict() - logentry.Add(jsonutils.NewString(model.GetName()), "obj_name") + logentry.Add(jsonutils.NewString(objName), "obj_name") logentry.Add(jsonutils.NewString(model.Keyword()), "obj_type") logentry.Add(jsonutils.NewString(objId), "obj_id") logentry.Add(jsonutils.NewString(action), "action")