Merge pull request #11014 from swordqiu/automated-cherry-pick-of-#11013-upstream-release-3.7

Automated cherry pick of #11013: fix: missing yunionconf log
This commit is contained in:
Zexi Li
2021-05-10 12:00:09 +08:00
committed by GitHub
2 changed files with 10 additions and 1 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ var (
)
// golang 不支持 const 的string array, http://t.cn/EzAvbw8
var BLACK_LIST_OBJ_TYPE = []string{"parameter"}
var BLACK_LIST_OBJ_TYPE = []string{} // "parameter"}
var logclientWorkerMan *appsrv.SWorkerManager
+9
View File
@@ -16,6 +16,7 @@ package models
import (
"context"
"fmt"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -379,3 +380,11 @@ func (model *SParameter) GetOwnerId() mcclient.IIdentityProvider {
func (manager *SParameterManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) {
return db.FetchUserInfo(ctx, data)
}
func (model *SParameter) GetId() string {
return fmt.Sprintf("%d", model.Id)
}
func (model *SParameter) GetName() string {
return model.Name
}