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

Merge pull request #561 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resize-opslog-notes to release/2.3.0

Browse Source 
* commit '46b67e9dc97834baae30515e55170311d13450a6':
  minor updates
  1. resize opslog notes to VARCHAR(2048) 2. cloudaccount sync status check
This commit is contained in:
邱剑
2018-11-23 15:04:09 +08:00
parent c67e949e68 46b67e9dc9
commit 78e9154b4f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/opslog.go
+1 -1
View File
@@ -153,7 +153,7 @@ type SOpsLog struct {
ObjId string `width:"128" charset:"ascii" nullable:"false" list:"user"` // = Column(VARCHAR(ID_LENGTH, charset='ascii'), nullable=False)
ObjName string `width:"128" charset:"utf8" nullable:"false" list:"user"` //= Column(VARCHAR(128, charset='utf8'), nullable=False)
Action string `width:"32" charset:"ascii" nullable:"false" list:"user"` //= Column(VARCHAR(32, charset='ascii'), nullable=False)
Notes string `width:"1024" charset:"utf8" list:"user"` // = Column(VARCHAR(1024, charset='utf8'))
Notes string `width:"2048" charset:"utf8" list:"user"` // = Column(VARCHAR(2048, charset='utf8'))
ProjectId string `name:"tenant_id" width:"128" charset:"ascii" list:"user"` // = Column(VARCHAR(ID_LENGTH, charset='ascii'))
Project string `name:"tenant" width:"128" charset:"utf8" list:"user"` // tenant = Column(VARCHAR(128, charset='utf8'))
UserId string `width:"128" charset:"ascii" list:"user"` // = Column(VARCHAR(ID_LENGTH, charset='ascii'))
pkg/compute/models/cloudaccounts.go
+1 -1
View File
@@ -187,7 +187,7 @@ func (self *SCloudaccount) getPassword() (string, error) {
}
func (self *SCloudaccount) CanSync() bool {
if self.Status == CLOUD_PROVIDER_SYNCING {
if self.Status == CLOUD_PROVIDER_SYNCING || self.Status == CLOUD_PROVIDER_START_SYNC {
if self.LastSync.IsZero() || time.Now().Sub(self.LastSync) > 900*time.Second {
return true
} else {