From 7b79288b55077c5f378b5f5e45f2ac8fd3be76ee Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Sat, 14 Sep 2019 08:24:27 +0100
Subject: Ensure enough time has elapsed before looking for the message to
reget in the case of heartbeat running out
---
bookpipeline/aws.go | 3 +++
bookpipeline/cmd/bookpipeline/main.go | 1 +
2 files changed, 4 insertions(+)
diff --git a/bookpipeline/aws.go b/bookpipeline/aws.go
index e7ecd07..d51e4ea 100644
--- a/bookpipeline/aws.go
+++ b/bookpipeline/aws.go
@@ -5,6 +5,7 @@ import (
"fmt"
"log"
"os"
+ "time"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
@@ -131,6 +132,8 @@ func (a *AwsConn) QueueHeartbeat(msg Qmsg, qurl string, duration int64) (Qmsg, e
// Check if the visibility timeout has exceeded the maximum allowed,
// and if so try to find the message again to get a new handle.
if ok && aerr.Code() == "InvalidParameterValue" {
+ // Wait for existing visibilitytimeout to expire
+ time.Sleep(time.Duration(duration) * time.Second)
// Try 3 times to find the message
for range [3]bool{} {
msgResult, err := a.sqssvc.ReceiveMessage(&sqs.ReceiveMessageInput{
diff --git a/bookpipeline/cmd/bookpipeline/main.go b/bookpipeline/cmd/bookpipeline/main.go
index 610b969..f1309ca 100644
--- a/bookpipeline/cmd/bookpipeline/main.go
+++ b/bookpipeline/cmd/bookpipeline/main.go
@@ -242,6 +242,7 @@ func heartbeat(conn Pipeliner, t *time.Ticker, msg bookpipeline.Qmsg, queue stri
return
}
if m.Id != "" {
+ conn.GetLogger().Println("Replaced message handle as visibilitytimeout limit was reached")
currentmsg = m
// TODO: maybe handle communicating new msg more gracefully than this
for range msgc {
--
cgit v1.2.1-24-ge1ad