@@ -217,29 +217,28 @@ func (this_ *Service) Pull(groupId string, topics []string, PullSize int, PullTi
217
217
if err != nil {
218
218
return
219
219
}
220
+ defer func () {
221
+ e := group .Close ()
222
+ if e != nil {
223
+ util .Logger .Error ("group close error" , zap .Error (e ))
224
+ }
225
+ }()
220
226
ctx , cancel := context .WithTimeout (context .Background (), time .Millisecond * time .Duration (PullTimeout ))
221
227
handler := & consumerGroupHandler {
222
228
size : PullSize ,
223
229
cancel : cancel ,
224
230
}
225
231
util .Logger .Info ("kafka pull start" , zap .Any ("topics" , topics ), zap .Any ("groupId" , groupId ), zap .Any ("timeout" , PullTimeout ))
226
232
err = group .Consume (ctx , topics , handler )
227
-
228
233
util .Logger .Info ("kafka pull end" , zap .Any ("topics" , topics ), zap .Any ("groupId" , groupId ), zap .Any ("timeout" , PullTimeout ))
229
234
if err != nil {
230
235
util .Logger .Error ("group consume error" , zap .Error (err ))
236
+ return
231
237
}
232
238
233
- err = group .Close ()
234
- if err != nil {
235
- util .Logger .Error ("group close error" , zap .Error (err ))
236
- }
237
239
for _ , one := range handler .messages {
238
240
var msg * Message
239
- msg , err = ConsumerMessageToMessage (keyType , valueType , one )
240
- if err != nil {
241
- return
242
- }
241
+ msg = ConsumerMessageToMessage (keyType , valueType , one )
243
242
msgList = append (msgList , msg )
244
243
}
245
244
return
@@ -901,7 +900,7 @@ func MessageToProducerMessage(msg *Message) (producerMessage *sarama.ProducerMes
901
900
return
902
901
}
903
902
904
- func ConsumerMessageToMessage (keyType string , valueType string , consumerMessage * sarama.ConsumerMessage ) (msg * Message , err error ) {
903
+ func ConsumerMessageToMessage (keyType string , valueType string , consumerMessage * sarama.ConsumerMessage ) (msg * Message ) {
905
904
var key string
906
905
var value string
907
906
0 commit comments