revid: simplified multiSender Write method

revid/senders.go

@@ -57,6 +57,7 @@ type Sender interface {
 type multiSender struct {
 	owner   *Revid
 	senders []loadSender
+	retry   bool
 }
 
 // newMultiSender returns a pointer to a new multiSender.
@@ -69,28 +70,23 @@ func newMultiSender(owner *Revid, senders []loadSender) *multiSender {
 // sends we notify the current sender to take any required actions and then try
 // the send again.
 func (s *multiSender) Write(d []byte) (int, error) {
-	for i, sender := range s.senders {
+	for _, sender := range s.senders {
 		sender.load(d)
-		err := sender.send()
+		for s.owner.IsRunning() {
-		if err != nil {
+			err := sender.send()
-			s.owner.config.Logger.Log(logger.Warning, "send failed", "output", i, "error", err)
+			if err != nil {
-			s.handleFail(sender, err)
+				s.handleFail(sender, err)
-			if s.owner.config.SendRetry {
+			}
-				for {
+			if err == nil || !s.retry {
-					if !s.owner.IsRunning() {
+				break
-						sender.release()
-						return 0, err
-					}
-					err = sender.send()
-					if err == nil {
-						break
-					}
-					s.handleFail(sender, err)
-				}
 			}
 		}
+	}
+
+	for _, sender := range s.senders {
 		sender.release()
 	}
+
 	return len(d), nil
 }