test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-01 03:07:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

create service occur add env error(record already exist), recover it

Browse Source
This commit is contained in:
凡羊羊 2019-11-14 17:05:05 +08:00
parent 3d16d353df
commit 55d06ce6cb
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/handler/service.go
View File

@ -35,6 +35,7 @@ import (
"github.com/goodrain/rainbond/builder/parser"
"github.com/goodrain/rainbond/cmd/api/option"
"github.com/goodrain/rainbond/db"
"github.com/goodrain/rainbond/db/errors"
core_model "github.com/goodrain/rainbond/db/model"
dbmodel "github.com/goodrain/rainbond/db/model"
"github.com/goodrain/rainbond/event"
@ -514,9 +515,17 @@ func (s *ServiceAction) ServiceCreate(sc *api_model.ServiceStruct) error {
env.ServiceID = ts.ServiceID
env.TenantID = ts.TenantID
if err := db.GetManager().TenantServiceEnvVarDaoTransactions(tx).AddModel(&env); err != nil {
logrus.Errorf("add env %v error, %v", env.AttrName, err)
tx.Rollback()
return err
logrus.Errorf("add env[name=%s] error, %v", env.AttrName, err)
if err != errors.ErrRecordAlreadyExist {
tx.Rollback()
return err
}
logrus.Warningf("recover env[name=%s]", env.AttrName)
// if env already exists, update it
if err = db.GetManager().TenantServiceEnvVarDaoTransactions(tx).UpdateModel(&env); err != nil {
tx.Rollback()
return err
}
}
}
}