diff options
| -rw-r--r-- | aws.go | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -51,7 +51,6 @@ type AwsConn struct { downloader *s3manager.Downloader uploader *s3manager.Uploader wipequrl, prequrl, ocrpgqurl, analysequrl string - testqurl string wipstorageid string } @@ -126,15 +125,6 @@ func (a *AwsConn) Init() error { } a.analysequrl = *result.QueueUrl - a.Logger.Println("Getting test queue URL") - result, err = a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{ - QueueName: aws.String(queueTest), - }) - if err != nil { - return errors.New(fmt.Sprintf("Error getting test queue URL: %s", err)) - } - a.testqurl = *result.QueueUrl - return nil } @@ -347,7 +337,17 @@ func (a *AwsConn) WIPStorageId() string { } func (a *AwsConn) TestQueueId() string { - return a.testqurl + // We don't bother saving the queue id in Init(), as it's only + // used for testing + a.Logger.Println("Getting test queue URL") + result, err := a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{ + QueueName: aws.String(queueTest), + }) + if err != nil { + a.Logger.Printf("Error getting test queue URL: %s\n", err) + return "" + } + return *result.QueueUrl } func (a *AwsConn) ListObjects(bucket string, prefix string) ([]string, error) { |