This is an automated email from the ASF dual-hosted git repository.
dinglei pushed a commit to branch native
in repository https://gitbox.apache.org/repos/asf/rocketmq-client-go.git
The following commit(s) were added to refs/heads/native by this push:
new b14d435 fix ci error (#275)
b14d435 is described below
commit b14d435bcc28f796e6739ec3210b906fb8a4b2ad
Author: wenfeng <[email protected]>
AuthorDate: Fri Nov 1 14:17:00 2019 +0800
fix ci error (#275)
---
internal/client.go | 2 +-
internal/model.go | 4 ++--
internal/remote/remote_client.go | 2 +-
internal/route.go | 6 +++---
internal/trace.go | 2 +-
internal/utils/errors.go | 2 +-
producer/producer.go | 6 +++---
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/internal/client.go b/internal/client.go
index debc87c..e9cc59a 100644
--- a/internal/client.go
+++ b/internal/client.go
@@ -380,7 +380,7 @@ func (c *rmqClient) SendHeartbeatToAllBrokerWithLock() {
m[brokerName] = int32(response.Version)
rlog.Debug("send heart beat to broker success",
map[string]interface{}{
"brokerName": brokerName,
- "brokerId": id,
+ "brokerId": id,
"brokerAddr": addr,
})
}
diff --git a/internal/model.go b/internal/model.go
index b7aa125..8c95458 100644
--- a/internal/model.go
+++ b/internal/model.go
@@ -93,10 +93,10 @@ func (data *heartbeatData) encode() []byte {
d, err := json.Marshal(data)
if err != nil {
rlog.Error("marshal heartbeatData error",
map[string]interface{}{
- rlog.LogKeyUnderlayError: err,
+ rlog.LogKeyUnderlayError: err,
})
return nil
}
- rlog.Debug("heartbeat: " + string(d), nil)
+ rlog.Debug("heartbeat: "+string(d), nil)
return d
}
diff --git a/internal/remote/remote_client.go b/internal/remote/remote_client.go
index 6d34a8b..7961896 100644
--- a/internal/remote/remote_client.go
+++ b/internal/remote/remote_client.go
@@ -210,7 +210,7 @@ func (c *remotingClient) processCMD(cmd *RemotingCommand, r
net.Conn) {
if err != nil {
rlog.Warning("send response to
broker error", map[string]interface{}{
rlog.LogKeyUnderlayError: err,
- "responseCode":
res.Code,
+ "responseCode":
res.Code,
})
}
}
diff --git a/internal/route.go b/internal/route.go
index e05034f..39551be 100644
--- a/internal/route.go
+++ b/internal/route.go
@@ -74,7 +74,7 @@ func (s *namesrvs) cleanOfflineBroker() {
delete(bd.BrokerAddresses, k)
rlog.Info("the broker: [name=%s, ID=%d,
addr=%s,] is offline, remove it", map[string]interface{}{
"brokerName": brokerName,
- "brokerID": k,
+ "brokerID": k,
"brokerAddr": v,
})
}
@@ -141,9 +141,9 @@ func (s *namesrvs) UpdateTopicRouteInfo(topic string)
*TopicRouteData {
if changed {
s.routeDataMap.Store(topic, routeData)
rlog.Info("the topic route info changed",
map[string]interface{}{
- rlog.LogKeyTopic: topic,
+ rlog.LogKeyTopic: topic,
rlog.LogKeyValueChangedFrom: oldRouteData,
- rlog.LogKeyValueChangedTo: routeData.String(),
+ rlog.LogKeyValueChangedTo: routeData.String(),
})
for _, brokerData := range routeData.BrokerDataList {
s.brokerAddressesMap.Store(brokerData.BrokerName,
brokerData)
diff --git a/internal/trace.go b/internal/trace.go
index 53ff5a2..1392e77 100644
--- a/internal/trace.go
+++ b/internal/trace.go
@@ -404,7 +404,7 @@ func (td *traceDispatcher) sendTraceDataByMQ(keySet Keyset,
regionID string, dat
}
var req = td.buildSendRequest(mq, msg)
- err := td.cli.InvokeAsync(context.Background(), addr, req, 5 *
time.Second, func(command *remote.RemotingCommand, e error) {
+ err := td.cli.InvokeAsync(context.Background(), addr, req,
5*time.Second, func(command *remote.RemotingCommand, e error) {
if e != nil {
rlog.Error("send trace data error",
map[string]interface{}{
"traceData": data,
diff --git a/internal/utils/errors.go b/internal/utils/errors.go
index c689f04..c57e768 100644
--- a/internal/utils/errors.go
+++ b/internal/utils/errors.go
@@ -33,7 +33,7 @@ var (
func CheckError(action string, err error) {
if err != nil {
- rlog.Error( action, map[string]interface{}{
+ rlog.Error(action, map[string]interface{}{
rlog.LogKeyUnderlayError: err.Error(),
})
}
diff --git a/producer/producer.go b/producer/producer.go
index 3fb8041..f0a995b 100644
--- a/producer/producer.go
+++ b/producer/producer.go
@@ -397,8 +397,8 @@ func (tp *transactionProducer) checkTransactionState() {
err :=
tp.producer.client.InvokeOneWay(context.Background(), callback.Addr.String(),
req,
tp.producer.options.SendMsgTimeout)
rlog.Error("send ReqENDTransaction to broker error",
map[string]interface{}{
- "callback": callback.Addr.String(),
- "request": req.String(),
+ "callback":
callback.Addr.String(),
+ "request": req.String(),
rlog.LogKeyUnderlayError: err,
})
default:
@@ -429,7 +429,7 @@ func (tp *transactionProducer) SendMessageInTransaction(ctx
context.Context, msg
if localTransactionState != primitive.CommitMessageState {
rlog.Error("executeLocalTransaction but state
unexpected", map[string]interface{}{
"localState": localTransactionState,
- "message": msg,
+ "message": msg,
})
}
