Browse Source
Merge pull request #48 from wuqinqiang/main
1.cont always not nil . 2.fix typo
pull/50/head
yedf2
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
common/types.go
-
dtmgrpc/dtmgrpc.proto
|
|
@ -165,7 +165,7 @@ func init() { |
|
|
break |
|
|
break |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if cont != nil && len(cont) != 0 { |
|
|
if len(cont) != 0 { |
|
|
dtmcli.Logf("cont is: \n%s", string(cont)) |
|
|
dtmcli.Logf("cont is: \n%s", string(cont)) |
|
|
err := yaml.Unmarshal(cont, &DtmConfig) |
|
|
err := yaml.Unmarshal(cont, &DtmConfig) |
|
|
dtmcli.FatalIfError(err) |
|
|
dtmcli.FatalIfError(err) |
|
|
|
|
|
@ -15,7 +15,7 @@ service Dtm { |
|
|
rpc RegisterXaBranch(DtmXaBranchRequest) returns (google.protobuf.Empty) {} |
|
|
rpc RegisterXaBranch(DtmXaBranchRequest) returns (google.protobuf.Empty) {} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// DtmRequest 发给dtm服务器的消息,响应为Emtpy,error == nil为成功,== Aborted 为失败 == 其他 可以重试 |
|
|
// DtmRequest 发给dtm服务器的消息,响应为Empty,error == nil为成功,== Aborted 为失败 == 其他 可以重试 |
|
|
message DtmRequest { |
|
|
message DtmRequest { |
|
|
string Gid = 1; |
|
|
string Gid = 1; |
|
|
string TransType = 2; |
|
|
string TransType = 2; |
|
|
|