@@ -24,6 +24,7 @@ import ( | |||||
"github.com/seata/seata-go/pkg/integration" | "github.com/seata/seata-go/pkg/integration" | ||||
"github.com/seata/seata-go/pkg/remoting/getty" | "github.com/seata/seata-go/pkg/remoting/getty" | ||||
"github.com/seata/seata-go/pkg/remoting/processor/client" | "github.com/seata/seata-go/pkg/remoting/processor/client" | ||||
"github.com/seata/seata-go/pkg/rm" | |||||
"github.com/seata/seata-go/pkg/rm/tcc" | "github.com/seata/seata-go/pkg/rm/tcc" | ||||
"github.com/seata/seata-go/pkg/tm" | "github.com/seata/seata-go/pkg/tm" | ||||
"github.com/seata/seata-go/pkg/util/log" | "github.com/seata/seata-go/pkg/util/log" | ||||
@@ -69,6 +70,10 @@ func initRmClient(cfg *Config) { | |||||
onceInitRmClient.Do(func() { | onceInitRmClient.Do(func() { | ||||
log.Init() | log.Init() | ||||
initRemoting(cfg) | initRemoting(cfg) | ||||
rm.InitRm(rm.RmConfig{ | |||||
ApplicationID: cfg.ApplicationID, | |||||
TxServiceGroup: cfg.TxServiceGroup, | |||||
}) | |||||
client.RegisterProcessor() | client.RegisterProcessor() | ||||
integration.Init() | integration.Init() | ||||
tcc.InitTCC() | tcc.InitTCC() | ||||
@@ -75,6 +75,7 @@ func (cfg *TransportConfig) RegisterFlagsWithPrefix(prefix string, f *flag.FlagS | |||||
f.DurationVar(&cfg.RPCTmRequestTimeout, prefix+".rpc-tm-request-timeout", 30*time.Second, "TM send request timeout.") | f.DurationVar(&cfg.RPCTmRequestTimeout, prefix+".rpc-tm-request-timeout", 30*time.Second, "TM send request timeout.") | ||||
} | } | ||||
// todo refactor config | |||||
type SeataConfig struct { | type SeataConfig struct { | ||||
ApplicationID string | ApplicationID string | ||||
TxServiceGroup string | TxServiceGroup string | ||||
@@ -141,6 +141,6 @@ func (c *RpcClient) setSessionConfig(session getty.Session) { | |||||
session.SetEventListener(GetGettyClientHandlerInstance()) | session.SetEventListener(GetGettyClientHandlerInstance()) | ||||
session.SetReadTimeout(c.gettyConf.SessionConfig.TCPReadTimeout) | session.SetReadTimeout(c.gettyConf.SessionConfig.TCPReadTimeout) | ||||
session.SetWriteTimeout(c.gettyConf.SessionConfig.TCPWriteTimeout) | session.SetWriteTimeout(c.gettyConf.SessionConfig.TCPWriteTimeout) | ||||
session.SetCronPeriod((int)(c.gettyConf.SessionConfig.CronPeriod.Nanoseconds() / 1e6)) | |||||
session.SetCronPeriod((int)(c.gettyConf.SessionConfig.CronPeriod.Milliseconds())) | |||||
session.SetWaitTime(c.gettyConf.SessionConfig.WaitTimeout) | session.SetWaitTime(c.gettyConf.SessionConfig.WaitTimeout) | ||||
} | } |
@@ -54,7 +54,7 @@ func (f *rmBranchRollbackProcessor) Process(ctx context.Context, rpcMessage mess | |||||
log.Errorf("branch rollback error: %s", err.Error()) | log.Errorf("branch rollback error: %s", err.Error()) | ||||
return err | return err | ||||
} | } | ||||
log.Infof("branch rollback success: xid %s, branchID %s, resourceID %s, applicationData %s", xid, branchID, resourceID, applicationData) | |||||
log.Infof("branch rollback success: xid %s, branchID %d, resourceID %s, applicationData %s", xid, branchID, resourceID, applicationData) | |||||
var ( | var ( | ||||
resultCode message.ResultCode | resultCode message.ResultCode | ||||
@@ -17,11 +17,14 @@ | |||||
package rm | package rm | ||||
// Init init seata client | |||||
func Init() { | |||||
initRmClient() | |||||
var rmConfig RmConfig | |||||
type RmConfig struct { | |||||
ApplicationID string | |||||
TxServiceGroup string | |||||
} | } | ||||
// InitRmClient init seata rm client | // InitRmClient init seata rm client | ||||
func initRmClient() { | |||||
func InitRm(cfg RmConfig) { | |||||
rmConfig = cfg | |||||
} | } |
@@ -99,10 +99,9 @@ func (r *RMRemoting) LockQuery(param LockQueryParam) (bool, error) { | |||||
func (r *RMRemoting) RegisterResource(resource Resource) error { | func (r *RMRemoting) RegisterResource(resource Resource) error { | ||||
req := message.RegisterRMRequest{ | req := message.RegisterRMRequest{ | ||||
AbstractIdentifyRequest: message.AbstractIdentifyRequest{ | AbstractIdentifyRequest: message.AbstractIdentifyRequest{ | ||||
// todo replace with config | |||||
Version: "1.5.2", | Version: "1.5.2", | ||||
ApplicationId: "tcc-sample", | |||||
TransactionServiceGroup: "my_test_tx_group", | |||||
ApplicationId: rmConfig.ApplicationID, | |||||
TransactionServiceGroup: rmConfig.TxServiceGroup, | |||||
}, | }, | ||||
ResourceIds: resource.GetResourceId(), | ResourceIds: resource.GetResourceId(), | ||||
} | } | ||||