test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-02 11:47:36 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] merge confilct error

Browse Source
This commit is contained in:
huangrh 2019-03-09 22:17:52 +08:00
parent 5ce8b28c73
commit 9c9c6f6b1d
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/handler/handler.go
View File

@ -70,7 +70,7 @@ func InitHandle(conf option.Config, statusCli *client.AppRuntimeSyncClient) erro
return err
}
defaultGatewayHandler = CreateGatewayManager(dbmanager, mqClient)
def3rdPartySvcHandler = Create3rdPartySvcHandler(dbmanager)
def3rdPartySvcHandler = Create3rdPartySvcHandler(dbmanager, statusCli)
operationHandler = CreateOperationHandler(mqClient)
batchOperationHandler = CreateBatchOperationHandler(mqClient, operationHandler)

3
gateway/store/store.go
View File

@ -34,8 +34,7 @@ import (
"github.com/eapache/channels"
"github.com/goodrain/rainbond/cmd/gateway/option"
"github.com/goodrain/rainbond/gateway/annotations"
v1 "github.com/goodrain/rainbond/gateway/v1"
apiv1 "k8s.io/api/core/v1"
"github.com/goodrain/rainbond/gateway/v1"
corev1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

4
worker/handle/manager.go
View File

@ -360,10 +360,10 @@ func (m *Manager) applyRuleExec(task *model.Task) error {
}
var newAppService *v1.AppService
if svc.Kind == dbmodel.ServiceKindThirdParty.String() {
newAppService, err = conversion.InitAppService(m.dbmanager, body.ServiceID,
newAppService, err = conversion.InitAppService(m.dbmanager, body.ServiceID, nil,
"ServiceSource", "TenantServiceBase", "TenantServiceRegist")
} else {
newAppService, err = conversion.InitAppService(m.dbmanager, body.ServiceID)
newAppService, err = conversion.InitAppService(m.dbmanager, body.ServiceID, nil)
}
if err != nil {
logrus.Errorf("Application init create failure:%s", err.Error())