From 834e07f45f93f29df3b8ef07dd3f311ba133e218 Mon Sep 17 00:00:00 2001 From: wuqinqiang <1185079673@qq.com> Date: Tue, 2 Nov 2021 22:23:41 +0800 Subject: [PATCH] 1.cont always not nil 2.fix typo --- common/types.go | 2 +- dtmgrpc/dtmgrpc.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/types.go b/common/types.go index e080313..5ba62be 100644 --- a/common/types.go +++ b/common/types.go @@ -165,7 +165,7 @@ func init() { break } } - if cont != nil && len(cont) != 0 { + if len(cont) != 0 { dtmcli.Logf("cont is: \n%s", string(cont)) err := yaml.Unmarshal(cont, &DtmConfig) dtmcli.FatalIfError(err) diff --git a/dtmgrpc/dtmgrpc.proto b/dtmgrpc/dtmgrpc.proto index e6fe971..20e88f9 100644 --- a/dtmgrpc/dtmgrpc.proto +++ b/dtmgrpc/dtmgrpc.proto @@ -15,7 +15,7 @@ service Dtm { rpc RegisterXaBranch(DtmXaBranchRequest) returns (google.protobuf.Empty) {} } -// DtmRequest 发给dtm服务器的消息,响应为Emtpy,error == nil为成功,== Aborted 为失败 == 其他 可以重试 +// DtmRequest 发给dtm服务器的消息,响应为Empty,error == nil为成功,== Aborted 为失败 == 其他 可以重试 message DtmRequest { string Gid = 1; string TransType = 2;