From 6199b3b7a47df39f6697fded422d90659edad728 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Mon, 10 Sep 2018 15:38:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/logclient/logclient.go | 154 ++++++++++++++++---------------- 1 file changed, 76 insertions(+), 78 deletions(-) diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index 3e070285b3..7456d87880 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -1,97 +1,95 @@ package logclient import ( - "fmt" + "fmt" - "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/onecloud/pkg/mcclient/auth" - "yunion.io/x/onecloud/pkg/mcclient/modules" - "yunion.io/x/pkg/util/stringutils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/pkg/util/stringutils" ) const ( - ACT_ADDTAG = "添加标签" - ACT_ALLOCATE = "分配" - ACT_BM_CONVERT_HYPER = "转换为宿主机" - ACT_BM_MAINTENANCE = "进入离线状态" - ACT_BM_UNCONVERT_HYPER = "转换为受管物理机" - ACT_BM_UNMAINTENANCE = "退出离线状态" - ACT_CANCEL_DELETE = "恢复" - ACT_CHANGE_OWNER = "更改项目" - ACT_CLOUD_FULLSYNC = "全量同步" - ACT_CLOUD_SYNC = "同步" - ACT_CREATE = "创建" - ACT_DELETE = "删除" - ACT_DISABLE = "禁用" - ACT_ENABLE = "启用" - ACT_GUEST_ATTACH_ISOLATED_DEVICE = "挂载透传设备" - ACT_GUEST_DETACH_ISOLATED_DEVICE = "卸载透传设备" - ACT_MERGE = "合并" - ACT_OFFLINE = "下线" - ACT_ONLINE = "上线" - ACT_PRIVATE = "设为私有" - ACT_PUBLIC = "设为共享" - ACT_RELEASE_IP = "释放IP" - ACT_RESERVE_IP = "预留IP" - ACT_RESIZE = "扩容" - ACT_RMTAG = "删除标签" - ACT_SPLIT = "分割" - ACT_UNCACHED_IMAGE = "清除缓存" - ACT_UPDATE = "更新" - ACT_VM_ATTACH_DISK = "挂载磁盘" - ACT_VM_BIND_KEYPAIR = "绑定密钥" - ACT_VM_CHANGE_FLAVOR = "调整配置" - ACT_VM_DEPLOY = "部署" - ACT_VM_DETACH_DISK = "卸载磁盘" - ACT_VM_PURGE = "清除" - ACT_VM_REBUILD = "重装系统" - ACT_VM_RESET_PSWD = "重置密码" - ACT_VM_START = "开机" - ACT_VM_STOP = "关机" - ACT_VM_SYNC_CONF = "同步配置" - ACT_VM_SYNC_STATUS = "同步状态" - ACT_VM_UNBIND_KEYPAIR = "解绑密钥" + ACT_ADDTAG = "添加标签" + ACT_ALLOCATE = "分配" + ACT_BM_CONVERT_HYPER = "转换为宿主机" + ACT_BM_MAINTENANCE = "进入离线状态" + ACT_BM_UNCONVERT_HYPER = "转换为受管物理机" + ACT_BM_UNMAINTENANCE = "退出离线状态" + ACT_CANCEL_DELETE = "恢复" + ACT_CHANGE_OWNER = "更改项目" + ACT_CLOUD_FULLSYNC = "全量同步" + ACT_CLOUD_SYNC = "同步" + ACT_CREATE = "创建" + ACT_DELETE = "删除" + ACT_DISABLE = "禁用" + ACT_ENABLE = "启用" + ACT_GUEST_ATTACH_ISOLATED_DEVICE = "挂载透传设备" + ACT_GUEST_DETACH_ISOLATED_DEVICE = "卸载透传设备" + ACT_MERGE = "合并" + ACT_OFFLINE = "下线" + ACT_ONLINE = "上线" + ACT_PRIVATE = "设为私有" + ACT_PUBLIC = "设为共享" + ACT_RELEASE_IP = "释放IP" + ACT_RESERVE_IP = "预留IP" + ACT_RESIZE = "扩容" + ACT_RMTAG = "删除标签" + ACT_SPLIT = "分割" + ACT_UNCACHED_IMAGE = "清除缓存" + ACT_UPDATE = "更新" + ACT_VM_ATTACH_DISK = "挂载磁盘" + ACT_VM_BIND_KEYPAIR = "绑定密钥" + ACT_VM_CHANGE_FLAVOR = "调整配置" + ACT_VM_DEPLOY = "部署" + ACT_VM_DETACH_DISK = "卸载磁盘" + ACT_VM_PURGE = "清除" + ACT_VM_REBUILD = "重装系统" + ACT_VM_RESET_PSWD = "重置密码" + ACT_VM_START = "开机" + ACT_VM_STOP = "关机" + ACT_VM_SYNC_CONF = "同步配置" + ACT_VM_SYNC_STATUS = "同步状态" + ACT_VM_UNBIND_KEYPAIR = "解绑密钥" ) type IObject interface { - GetId() string - GetName() string - Keyword() string + GetId() string + GetName() string + Keyword() string } func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcclient.TokenCredential, success bool) { - token := userCred - notes := stringutils.Interface2String(iNotes) + token := userCred + notes := stringutils.Interface2String(iNotes) - s := auth.GetSession(userCred, "", "") + s := auth.GetSession(userCred, "", "") - 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(action), "action") - logentry.Add(jsonutils.NewString(token.GetUserId()), "user_id") - logentry.Add(jsonutils.NewString(token.GetUserName()), "user") - logentry.Add(jsonutils.NewString(token.GetTenantId()), "tenant_id") - logentry.Add(jsonutils.NewString(token.GetTenantName()), "tenant") + 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(action), "action") + logentry.Add(jsonutils.NewString(token.GetUserId()), "user_id") + logentry.Add(jsonutils.NewString(token.GetUserName()), "user") + logentry.Add(jsonutils.NewString(token.GetTenantId()), "tenant_id") + logentry.Add(jsonutils.NewString(token.GetTenantName()), "tenant") - if !success { - // 失败日志 - logentry.Add(jsonutils.JSONFalse, "success") - } else { - // 成功日志 - logentry.Add(jsonutils.JSONTrue, "success") - } - // TODO delete tag when done. - notes = fmt.Sprintf("[a2]%s", notes) - logentry.Add(jsonutils.NewString(notes), "notes") + if !success { + // 失败日志 + logentry.Add(jsonutils.JSONFalse, "success") + } else { + // 成功日志 + logentry.Add(jsonutils.JSONTrue, "success") + } + logentry.Add(jsonutils.NewString(notes), "notes") - _, err := modules.Actions.Create(s, logentry) - if err != nil { - fmt.Printf("create action log failed %s", err) - } else { - fmt.Println("create action log success") - } + _, err := modules.Actions.Create(s, logentry) + if err != nil { + fmt.Printf("create action log failed %s", err) + } else { + fmt.Println("create action log success") + } } From 3ffe3fc722de5e5a5e4b2fb67a1f5d5d78f11c6c Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Mon, 10 Sep 2018 15:40:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF;=20gofmt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/logclient/logclient.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index 7456d87880..bc3ad30601 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -84,6 +84,7 @@ func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcc // 成功日志 logentry.Add(jsonutils.JSONTrue, "success") } + logentry.Add(jsonutils.NewString(notes), "notes") _, err := modules.Actions.Create(s, logentry) From 7f624c46b501af2526191cf31c3db7c5726f7a94 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Mon, 10 Sep 2018 15:43:20 +0800 Subject: [PATCH 3/3] go fmt. --- pkg/util/logclient/logclient.go | 153 ++++++++++++++++---------------- 1 file changed, 76 insertions(+), 77 deletions(-) diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index bc3ad30601..82f3e76fd0 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -1,96 +1,95 @@ package logclient import ( - "fmt" - - "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/onecloud/pkg/mcclient/auth" - "yunion.io/x/onecloud/pkg/mcclient/modules" - "yunion.io/x/pkg/util/stringutils" + "fmt" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/pkg/util/stringutils" ) const ( - ACT_ADDTAG = "添加标签" - ACT_ALLOCATE = "分配" - ACT_BM_CONVERT_HYPER = "转换为宿主机" - ACT_BM_MAINTENANCE = "进入离线状态" - ACT_BM_UNCONVERT_HYPER = "转换为受管物理机" - ACT_BM_UNMAINTENANCE = "退出离线状态" - ACT_CANCEL_DELETE = "恢复" - ACT_CHANGE_OWNER = "更改项目" - ACT_CLOUD_FULLSYNC = "全量同步" - ACT_CLOUD_SYNC = "同步" - ACT_CREATE = "创建" - ACT_DELETE = "删除" - ACT_DISABLE = "禁用" - ACT_ENABLE = "启用" - ACT_GUEST_ATTACH_ISOLATED_DEVICE = "挂载透传设备" - ACT_GUEST_DETACH_ISOLATED_DEVICE = "卸载透传设备" - ACT_MERGE = "合并" - ACT_OFFLINE = "下线" - ACT_ONLINE = "上线" - ACT_PRIVATE = "设为私有" - ACT_PUBLIC = "设为共享" - ACT_RELEASE_IP = "释放IP" - ACT_RESERVE_IP = "预留IP" - ACT_RESIZE = "扩容" - ACT_RMTAG = "删除标签" - ACT_SPLIT = "分割" - ACT_UNCACHED_IMAGE = "清除缓存" - ACT_UPDATE = "更新" - ACT_VM_ATTACH_DISK = "挂载磁盘" - ACT_VM_BIND_KEYPAIR = "绑定密钥" - ACT_VM_CHANGE_FLAVOR = "调整配置" - ACT_VM_DEPLOY = "部署" - ACT_VM_DETACH_DISK = "卸载磁盘" - ACT_VM_PURGE = "清除" - ACT_VM_REBUILD = "重装系统" - ACT_VM_RESET_PSWD = "重置密码" - ACT_VM_START = "开机" - ACT_VM_STOP = "关机" - ACT_VM_SYNC_CONF = "同步配置" - ACT_VM_SYNC_STATUS = "同步状态" - ACT_VM_UNBIND_KEYPAIR = "解绑密钥" + ACT_ADDTAG = "添加标签" + ACT_ALLOCATE = "分配" + ACT_BM_CONVERT_HYPER = "转换为宿主机" + ACT_BM_MAINTENANCE = "进入离线状态" + ACT_BM_UNCONVERT_HYPER = "转换为受管物理机" + ACT_BM_UNMAINTENANCE = "退出离线状态" + ACT_CANCEL_DELETE = "恢复" + ACT_CHANGE_OWNER = "更改项目" + ACT_CLOUD_FULLSYNC = "全量同步" + ACT_CLOUD_SYNC = "同步" + ACT_CREATE = "创建" + ACT_DELETE = "删除" + ACT_DISABLE = "禁用" + ACT_ENABLE = "启用" + ACT_GUEST_ATTACH_ISOLATED_DEVICE = "挂载透传设备" + ACT_GUEST_DETACH_ISOLATED_DEVICE = "卸载透传设备" + ACT_MERGE = "合并" + ACT_OFFLINE = "下线" + ACT_ONLINE = "上线" + ACT_PRIVATE = "设为私有" + ACT_PUBLIC = "设为共享" + ACT_RELEASE_IP = "释放IP" + ACT_RESERVE_IP = "预留IP" + ACT_RESIZE = "扩容" + ACT_RMTAG = "删除标签" + ACT_SPLIT = "分割" + ACT_UNCACHED_IMAGE = "清除缓存" + ACT_UPDATE = "更新" + ACT_VM_ATTACH_DISK = "挂载磁盘" + ACT_VM_BIND_KEYPAIR = "绑定密钥" + ACT_VM_CHANGE_FLAVOR = "调整配置" + ACT_VM_DEPLOY = "部署" + ACT_VM_DETACH_DISK = "卸载磁盘" + ACT_VM_PURGE = "清除" + ACT_VM_REBUILD = "重装系统" + ACT_VM_RESET_PSWD = "重置密码" + ACT_VM_START = "开机" + ACT_VM_STOP = "关机" + ACT_VM_SYNC_CONF = "同步配置" + ACT_VM_SYNC_STATUS = "同步状态" + ACT_VM_UNBIND_KEYPAIR = "解绑密钥" ) type IObject interface { - GetId() string - GetName() string - Keyword() string + GetId() string + GetName() string + Keyword() string } func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcclient.TokenCredential, success bool) { - token := userCred - notes := stringutils.Interface2String(iNotes) + token := userCred + notes := stringutils.Interface2String(iNotes) - s := auth.GetSession(userCred, "", "") + s := auth.GetSession(userCred, "", "") - 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(action), "action") - logentry.Add(jsonutils.NewString(token.GetUserId()), "user_id") - logentry.Add(jsonutils.NewString(token.GetUserName()), "user") - logentry.Add(jsonutils.NewString(token.GetTenantId()), "tenant_id") - logentry.Add(jsonutils.NewString(token.GetTenantName()), "tenant") + 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(action), "action") + logentry.Add(jsonutils.NewString(token.GetUserId()), "user_id") + logentry.Add(jsonutils.NewString(token.GetUserName()), "user") + logentry.Add(jsonutils.NewString(token.GetTenantId()), "tenant_id") + logentry.Add(jsonutils.NewString(token.GetTenantName()), "tenant") - if !success { - // 失败日志 - logentry.Add(jsonutils.JSONFalse, "success") - } else { - // 成功日志 - logentry.Add(jsonutils.JSONTrue, "success") - } + if !success { + // 失败日志 + logentry.Add(jsonutils.JSONFalse, "success") + } else { + // 成功日志 + logentry.Add(jsonutils.JSONTrue, "success") + } - logentry.Add(jsonutils.NewString(notes), "notes") + logentry.Add(jsonutils.NewString(notes), "notes") - _, err := modules.Actions.Create(s, logentry) - if err != nil { - fmt.Printf("create action log failed %s", err) - } else { - fmt.Println("create action log success") - } + _, err := modules.Actions.Create(s, logentry) + if err != nil { + fmt.Printf("create action log failed %s", err) + } else { + fmt.Println("create action log success") + } }