Merge dcd06e4 into 334d2e6

server/sms/nexmo_sms_sender.go

@@ -29,7 +29,7 @@ const (
 	ResponseNumberBarred
 	ResponsePartnerAcctBarred
 	ResponsePartnerQuotaExceeded
-	ResponseUnused
+	ResponseUnused //Defined in Nexmo Api
 	ResponseRESTNotEnabled
 	ResponseMessageTooLong
 	ResponseCommunicationFailed
@@ -52,6 +52,7 @@ var (
 	ErrMultipleSmsSent           = errors.New("Multiple  or no sms we're sent.SMS message may be too long")
 	ErrRetryFailed               = errors.New("Failed retrying to send message")
 	ErrEncodeFailed              = errors.New("Encoding of message to be sent to Nexmo  failed")
+	ErrLastIdCouldNotBeSet       = errors.New("Setting last id failed")
 
 	errKafkaReportingConfiguration = errors.New("Kafka Reporting for Nexmo is not correctly configured")
 )

server/sms/sms_gateway.go

@@ -166,7 +166,7 @@ func (g *gateway) proxyLoop() error {
 			}
 
 			err := g.send(receivedMsg)
-			if err != nil && err == ErrRetryFailed {
+			if err != nil && (err == ErrRetryFailed || err == ErrLastIdCouldNotBeSet) {
 				// THIS MAY BE BLOCKING.Maybe not a good idea.
 				for err2 := g.SetLastSentID(receivedMsg.ID); err2 != nil; {
 					g.logger.WithField("error", err2.Error()).Error("Error setting last ID.Retrying")
@@ -196,7 +196,12 @@ func (g *gateway) send(receivedMsg *protocol.Message) error {
 	}
 	mTotalSentMessages.Add(1)
 	pSent.Inc()
-	g.SetLastSentID(receivedMsg.ID)
+	err = g.SetLastSentID(receivedMsg.ID)
+	if err != nil {
+		logger.WithField("error", err.Error()).Error("Setting last id for sms connector failed.")
+		return ErrLastIdCouldNotBeSet
+	}
+
 	return nil
 }