OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: offline state version

Browse Source
This commit is contained in:
simonzhangsz
2023-12-27 10:37:08 +08:00
parent 491456caa0
commit c708ea4215
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crontask/db.go
View File

@@ -139,7 +139,7 @@ type NeState struct {
Id int `json:"id" xorm:"pk 'id' autoincr"` Id int `json:"id" xorm:"pk 'id' autoincr"`
NeType string `json:"neType" xorm:"ne_type"` NeType string `json:"neType" xorm:"ne_type"`
NeId string `json:"neId" xorm:"ne_id"` NeId string `json:"neId" xorm:"ne_id"`
Version string `json:"version" xorm:"version"` Version string `json:"version" xorm:"column 'version' VARCHAR(16)"`
Capability uint32 `json:"capability" xorm:"capability"` Capability uint32 `json:"capability" xorm:"capability"`
SerialNum string `json:"serialNum" xorm:"serial_num"` SerialNum string `json:"serialNum" xorm:"serial_num"`
ExpiryDate string `json:"expiryDate" xorm:"expiry_date"` ExpiryDate string `json:"expiryDate" xorm:"expiry_date"`
@@ -157,7 +157,13 @@ func XormInsertNeState(neState *NeState) (int64, error) {
session := dbClient.xEngine.NewSession() session := dbClient.xEngine.NewSession()
defer session.Close() defer session.Close()
affected, err := session.InsertOne(neState) affected, err := session.InsertOne(neState)
session.Commit() if err != nil {
return 0, err
}
err = session.Commit()
if err != nil {
return 0, err
}
return affected, err return affected, err
} }

9
features/state/getstate.go
View File

@@ -154,7 +154,11 @@ func init() {
return 0, errors.New("quota exceeded") return 0, errors.New("quota exceeded")
}) })
*/ */
client.SetTimeout(time.Duration(2 * time.Second)) client.
SetTimeout(time.Duration(400 * time.Millisecond))
// SetRetryCount(1).
// SetRetryWaitTime(time.Duration(1 * time.Second)).
// SetRetryMaxWaitTime(time.Duration(2 * time.Second))
//client.SetTimeout(2 * time.Second) //client.SetTimeout(2 * time.Second)
} }
@@ -820,8 +824,9 @@ func GetStateFromNF(w http.ResponseWriter, r *http.Request) {
ErrorCode: "1", ErrorInfo: "Internal server error, NF connnect refused", ErrorCode: "1", ErrorInfo: "Internal server error, NF connnect refused",
} }
result["error"] = errorMessage result["error"] = errorMessage
SN, _ := dborm.XormGetNESN(ne.NeType, ne.NeId) SN, Version, _ := dborm.XormGetNEStateInfo(ne.NeType, ne.NeId)
result["serialNum"] = SN result["serialNum"] = SN
result["verion"] = Version
} else { } else {
systemState := make(map[string]interface{}) systemState := make(map[string]interface{})
_ = json.Unmarshal(resp.Body(), &systemState) _ = json.Unmarshal(resp.Body(), &systemState)

11
lib/dborm/dborm.go
View File

@@ -1821,13 +1821,14 @@ func XormGetTraceRawMsg(id int) (int64, []byte, error) {
return timestamp, rawMsg, nil return timestamp, rawMsg, nil
} }
func XormGetNESN(neType, neID string) (string, error) { func XormGetNEStateInfo(neType, neID string) (string, string, error) {
SN := "-" SN := "-"
Version := "-"
_, err := xEngine.Table("ne_state"). _, err := xEngine.Table("ne_state").
Where("ne_type=? and ne_id=?", neType, neID). Where("ne_type=? and ne_id=?", neType, neID).
Asc("timestamp"). Desc("timestamp").
Cols("serial_num"). Cols("serial_num", "version").
Limit(1). Limit(1).
Get(&SN) Get(&SN, &Version)
return SN, err return SN, Version, err
} }