TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-06 01:50:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复导致无法安装的严重Bug

Browse Source
This commit is contained in:
刘祥超
2021-08-05 19:53:54 +08:00
parent 5105af9918
commit a9ce2f45df
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/edge-api/main.go
View File

@@ -50,7 +50,7 @@ func main() {
fmt.Println("ERROR: " + err.Error()) fmt.Println("ERROR: " + err.Error())
return return
} }
err = executor.Run() err = executor.Run(true)
if err != nil { if err != nil {
fmt.Println("ERROR: " + err.Error()) fmt.Println("ERROR: " + err.Error())
return return

2
internal/const/const.go
View File

@@ -22,5 +22,5 @@ const (
UserNodeVersion = "0.0.10" UserNodeVersion = "0.0.10"
AuthorityNodeVersion = "0.0.2" AuthorityNodeVersion = "0.0.2"
MonitorNodeVersion = "0.0.2" MonitorNodeVersion = "0.0.2"
DNSNodeVersion = "0.1.0" DNSNodeVersion = "0.0.3"
) )

2
internal/nodes/api_node.go
View File

@@ -274,7 +274,7 @@ func (this *APINode) autoUpgrade() error {
// 不使用remotelog()，因为此时还没有启动完成 // 不使用remotelog()，因为此时还没有启动完成
logs.Println("[API_NODE]upgrade database starting ...") logs.Println("[API_NODE]upgrade database starting ...")
err = setup.NewSQLExecutor(dbConfig).Run() err = setup.NewSQLExecutor(dbConfig).Run(false)
if err != nil { if err != nil {
return errors.New("execute sql failed: " + err.Error()) return errors.New("execute sql failed: " + err.Error())
} }

2
internal/setup/setup.go
View File

@@ -93,7 +93,7 @@ func (this *Setup) Run() error {
} }
executor := NewSQLExecutor(dbConfig) executor := NewSQLExecutor(dbConfig)
err = executor.Run() err = executor.Run(false)
if err != nil { if err != nil {
return err return err
} }

2
internal/setup/sql.go
View File

File diff suppressed because one or more lines are too long

4
internal/setup/sql_executor.go
View File

@@ -47,14 +47,14 @@ func NewSQLExecutorFromCmd() (*SQLExecutor, error) {
return NewSQLExecutor(config.DBs[Tea.Env]), nil return NewSQLExecutor(config.DBs[Tea.Env]), nil
} }
func (this *SQLExecutor) Run() error { func (this *SQLExecutor) Run(showLog bool) error {
db, err := dbs.NewInstanceFromConfig(this.dbConfig) db, err := dbs.NewInstanceFromConfig(this.dbConfig)
if err != nil { if err != nil {
return err return err
} }
sqlDump := NewSQLDump() sqlDump := NewSQLDump()
_, err = sqlDump.Apply(db, LatestSQLResult, true) _, err = sqlDump.Apply(db, LatestSQLResult, showLog)
if err != nil { if err != nil {
return err return err
} }