opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #198 in YUNIONIO/onecloud from hotfix/rex-20180912-logclient-objid to release/2.1.0

Browse Source 
* commit '8e2d077f2aa9edd6a4ed45da1c664aef2826388c':
  logserver obj-name 默认值
  logserver objid 默认值
This commit is contained in:
邱剑
2018-09-13 12:16:48 +08:00
parent 28a662ecc8 8e2d077f2a
commit e5c7ad38d4
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/logclient/logclient.go
+11 -3
View File
@@ -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"
@@ -63,13 +64,20 @@ func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcc
token := userCred
notes := stringutils.Interface2String(iNotes)
s := auth.GetSession(userCred, "", "")
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(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")