opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

更改项目

Browse Source
This commit is contained in:
Zhang Dongliang
2018-08-29 15:43:59 +08:00
parent eb135f71dc
commit 3b8562a22c
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/opslog.go
+2
View File
@@ -10,6 +10,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/logclient"
"yunion.io/x/pkg/util/stringutils"
"yunion.io/x/sqlchemy"
)
@@ -302,6 +303,7 @@ func (manager *SOpsLogManager) SyncOwner(m IModel, former *STenant, userCred mcc
notes.Add(jsonutils.NewString(former.GetId()), "former_project_id")
notes.Add(jsonutils.NewString(former.GetName()), "form_project")
manager.LogEvent(m, ACT_CHANGE_OWNER, notes, userCred)
logclient.AddActionLog(m, logclient.ACT_CHANGE_OWNER, nil, userCred)
}
func (manager *SOpsLogManager) AllowListItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
pkg/compute/tasks/guest_deploy_task.go
+2
View File
@@ -9,6 +9,7 @@ import (
"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"
)
type GuestDeployTask struct {
@@ -56,6 +57,7 @@ func (self *GuestDeployTask) StartDeployGuestOnHost(ctx context.Context, guest *
} else {
self.OnDeployGuestSucc(guest)
}
logclient.AddActionLog(guest, logclient.ACT_VM_DEPLOY, err, self.UserCred)
}
func (self *GuestDeployTask) OnDeployGuestSucc(guest *models.SGuest) {
pkg/util/logclient/logclient.go
+30 -30
View File
@@ -11,41 +11,43 @@ import (
)
const (
ACT_VM_RESET_PSWD = "重置密码"
ACT_VM_REBUILD = "重装系统"
ACT_VM_START = "开机"
ACT_VM_STOP = "关机"
ACT_VM_PURGE = "清除"
ACT_VM_CHANGE_FLAVOR = "调整配置"
ACT_VM_SYNC_CONF = "同步配置"
ACT_GUEST_ATTACH_ISOLATED_DEVICE = "挂载透传设备"
ACT_GUEST_DETACH_ISOLATED_DEVICE = "卸载透传设备"
ACT_VM_SYNC_STATUS = "同步状态"
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_CREATE = "创建"
ACT_DELETE = "删除"
ACT_UPDATE = "更新"
ACT_RESERVE_IP = "预留IP"
ACT_RELEASE_IP = "释放IP"
ACT_CANCEL_DELETE = "恢复"
ACT_UNCACHED_IMAGE = "清除缓存"
ACT_ENABLE = "启用"
ACT_DISABLE = "禁用"
ACT_ONLINE = "上线"
ACT_OFFLINE = "下线"
ACT_PUBLIC = "设为共享"
ACT_PRIVATE = "设为私有"
ACT_ENABLE = "启用"
ACT_GUEST_ATTACH_ISOLATED_DEVICE = "挂载透传设备"
ACT_GUEST_DETACH_ISOLATED_DEVICE = "卸载透传设备"
ACT_MERGE = "合并"
ACT_SPLIT = "分割"
ACT_ALLOCATE = "分配"
ACT_BM_MAINTENANCE = "进入离线状态"
ACT_BM_UNMAINTENANCE = "退出离线状态"
ACT_BM_CONVERT_HYPER = "转换为宿主机"
ACT_BM_UNCONVERT_HYPER = "转换为受管物理机"
ACT_ADDTAG = "添加标签"
ACT_RMTAG = "删除标签"
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_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 = "同步状态"
)
type IObject interface {
@@ -55,8 +57,6 @@ type IObject interface {
}
func AddActionLog(model IObject, action string, iErr interface{}, userCred mcclient.TokenCredential) {
// (model IModel, action string, notes interface{}, userCred mcclient.TokenCredential
//func AddActionLog(userCred mcclient.TokenCredential, action, notes string, obj IObject, e string) { // originalk
token := userCred
notes := stringutils.Interface2String(iErr)