Modify report function.

The new implementation does not leak reports

backend.go

@@ -130,9 +130,7 @@ func (b *backend) Init() {
 					logger.Warn("Error on produce: Full queue")
 				}
 			case <-time.After(1 * time.Second):
-				if err := m.Report(-1, "Error on produce: No workers available"); err != nil {
-					logger.Warn(err)
-				}
+				m.Report(-1, "Error on produce: No workers available")
 			}
 		}
 	}()

messages.go

@@ -46,14 +46,17 @@ func (m *Message) Produce() error {
 }
 
 // Report is used by the sender to inform that a message has not been sent
-func (m *Message) Report(statusCode int, status string) error {
+func (m *Message) Report(statusCode int, status string) {
 	m.report.StatusCode = statusCode
 	m.report.Status = status
-	select {
-	case m.backend.reports <- m:
-	case <-time.After(1 * time.Second):
-		return errors.New("Error on report: Full queue")
-	}
 
-	return nil
+forLoop:
+	for {
+		select {
+		case m.backend.reports <- m:
+			break forLoop
+		case <-time.After(500 * time.Second):
+			logger.Warn("Retrying report report: Full queue")
+		}
+	}
 }

rbforwarder_test.go

@@ -26,9 +26,7 @@ func (tsender *TestSender) Send(m *Message) error {
 
 	select {
 	case tsender.channel <- string(m.OutputBuffer.Bytes()):
-		if err := m.Report(0, "OK"); err != nil {
-			log.Fatal(err)
-		}
+		m.Report(0, "OK")
 	}
 	return nil
 }

senders/httpsender/sender.go

@@ -190,9 +190,7 @@ func (s *Sender) batchSend(batchBuffer *batchBuffer, path string) {
 	if err != nil {
 		logger.Errorf("Error creating request: %s", err.Error())
 		for _, message := range batchBuffer.messages {
-			if err := message.Report(errRequest, err.Error()); err != nil {
-				logger.Error(err)
-			}
+			message.Report(errRequest, err.Error())
 		}
 		return
 	}
@@ -206,9 +204,7 @@ func (s *Sender) batchSend(batchBuffer *batchBuffer, path string) {
 	res, err := s.client.Do(req)
 	if err != nil {
 		for _, message := range batchBuffer.messages {
-			if err := message.Report(errHTTP, err.Error()); err != nil {
-				logger.Error(err)
-			}
+			message.Report(errHTTP, err.Error())
 		}
 		return
 	}
@@ -217,15 +213,11 @@ func (s *Sender) batchSend(batchBuffer *batchBuffer, path string) {
 	// Send the reports
 	if res.StatusCode >= 400 {
 		for _, message := range batchBuffer.messages {
-			if err := message.Report(errStatus, res.Status); err != nil {
-				logger.Error(err)
-			}
+			message.Report(errStatus, res.Status)
 		}
 	} else {
 		for _, message := range batchBuffer.messages {
-			if err := message.Report(0, res.Status); err != nil {
-				logger.Error(err)
-			}
+			message.Report(0, res.Status)
 		}
 	}