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

minor fixes

Browse Source
This commit is contained in:
Qiu Jian
2018-12-01 00:42:29 +08:00
parent bc0b5d1e44
commit 334f3605ba
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/interface.go
+1
View File
@@ -22,6 +22,7 @@ type IModelManager interface {
KeywordPlural() string
Alias() string
AliasPlural() string
SetAlias(alias string, aliasPlural string)
ValidateName(name string) error
pkg/cloudcommon/db/keystonecache.go
+1 -1
View File
@@ -64,7 +64,7 @@ func NewKeystoneCacheObject(id string, name string, domainId string, domain stri
}*/
func (manager *SKeystoneCacheObjectManager) BatchFetchNames(idStrs []string) []string {
t := manager.tableSpec.Instance()
t := manager.TableSpec().Instance()
results, err := t.Query(t.Field("name")).In("id", idStrs).AllStringMap()
if err != nil {
return nil
pkg/cloudcommon/db/opslog.go
-7
View File
@@ -176,13 +176,6 @@ var _ IModel = (*SOpsLog)(nil)
func init() {
OpsLog = &SOpsLogManager{NewModelBaseManager(SOpsLog{}, "opslog_tbl", "event", "events")}
}
func (manager *SOpsLogManager) SetKeyword(kw, kwPlural string) *SOpsLogManager {
manager.keyword = kw
manager.keywordPlural = kwPlural
return manager
}
func (opslog *SOpsLog) GetId() string {
pkg/cloudcommon/db/tenantcache.go
+2 -2
View File
@@ -90,8 +90,8 @@ func (manager *STenantCacheManager) fetchTenantFromKeystone(ctx context.Context,
}
func (manager *STenantCacheManager) Save(ctx context.Context, idStr string, name string, domainId string, domain string) (*STenant, error) {
lockman.LockRawObject(ctx, manager.keyword, idStr)
defer lockman.ReleaseRawObject(ctx, manager.keyword, idStr)
lockman.LockRawObject(ctx, manager.KeywordPlural(), idStr)
defer lockman.ReleaseRawObject(ctx, manager.KeywordPlural(), idStr)
objo, err := manager.FetchById(idStr)
if err != nil && err != sql.ErrNoRows {
pkg/cloudcommon/db/usercache.go
+2 -2
View File
@@ -53,8 +53,8 @@ func (manager *SUserCacheManager) FetchUserByName(idStr string) (*SUser, error)
}
func (manager *SUserCacheManager) Save(ctx context.Context, idStr string, name string, domainId string, domain string) (*SUser, error) {
lockman.LockRawObject(ctx, manager.keyword, idStr)
defer lockman.ReleaseRawObject(ctx, manager.keyword, idStr)
lockman.LockRawObject(ctx, manager.KeywordPlural(), idStr)
defer lockman.ReleaseRawObject(ctx, manager.KeywordPlural(), idStr)
obj, err := manager.FetchUserById(idStr)
if err != nil && err != sql.ErrNoRows {