From 9fb0842f07320d47509865c689747d2c82379f3d Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Tue, 7 Apr 2020 12:18:38 +0100
Subject: Remove unused OCR queue (was superceded by the ocrpage queue some
 time ago)

---
 aws.go | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

(limited to 'aws.go')

diff --git a/aws.go b/aws.go
index 5f1befa..2015d9c 100644
--- a/aws.go
+++ b/aws.go
@@ -40,16 +40,14 @@ type AwsConn struct {
 	Region string
 	Logger *log.Logger
 
-	// these are used internally
-	sess                                    *session.Session
-	ec2svc                                  *ec2.EC2
-	s3svc                                   *s3.S3
-	sqssvc                                  *sqs.SQS
-	downloader                              *s3manager.Downloader
-	uploader                                *s3manager.Uploader
-	wipequrl, prequrl, ocrqurl, analysequrl string
-	ocrpgqurl                               string
-	wipstorageid                            string
+	sess                                      *session.Session
+	ec2svc                                    *ec2.EC2
+	s3svc                                     *s3.S3
+	sqssvc                                    *sqs.SQS
+	downloader                                *s3manager.Downloader
+	uploader                                  *s3manager.Uploader
+	wipequrl, prequrl, ocrpgqurl, analysequrl string
+	wipstorageid                              string
 }
 
 // MinimalInit does the bare minimum to initialise aws services
@@ -105,14 +103,14 @@ func (a *AwsConn) Init() error {
 	}
 	a.wipequrl = *result.QueueUrl
 
-	a.Logger.Println("Getting OCR queue URL")
+	a.Logger.Println("Getting OCR Page queue URL")
 	result, err = a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{
-		QueueName: aws.String(queueOcr),
+		QueueName: aws.String(queueOcrPage),
 	})
 	if err != nil {
-		return errors.New(fmt.Sprintf("Error getting OCR queue URL: %s", err))
+		return errors.New(fmt.Sprintf("Error getting OCR Page queue URL: %s", err))
 	}
-	a.ocrqurl = *result.QueueUrl
+	a.ocrpgqurl = *result.QueueUrl
 
 	a.Logger.Println("Getting analyse queue URL")
 	result, err = a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{
@@ -123,15 +121,6 @@ func (a *AwsConn) Init() error {
 	}
 	a.analysequrl = *result.QueueUrl
 
-	a.Logger.Println("Getting OCR Page queue URL")
-	result, err = a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{
-		QueueName: aws.String(queueOcrPage),
-	})
-	if err != nil {
-		return errors.New(fmt.Sprintf("Error getting OCR Page queue URL: %s", err))
-	}
-	a.ocrpgqurl = *result.QueueUrl
-
 	return nil
 }
 
@@ -245,10 +234,6 @@ func (a *AwsConn) WipeQueueId() string {
 	return a.wipequrl
 }
 
-func (a *AwsConn) OCRQueueId() string {
-	return a.ocrqurl
-}
-
 func (a *AwsConn) OCRPageQueueId() string {
 	return a.ocrpgqurl
 }
@@ -467,7 +452,7 @@ func (a *AwsConn) Log(v ...interface{}) {
 // mkpipeline sets up necessary buckets and queues for the pipeline
 func (a *AwsConn) MkPipeline() error {
 	buckets := []string{storageWip}
-	queues := []string{queuePreProc, queueWipeOnly, queueOcr, queueAnalyse, queueOcrPage}
+	queues := []string{queuePreProc, queueWipeOnly, queueAnalyse, queueOcrPage}
 
 	for _, bucket := range buckets {
 		err := a.CreateBucket(bucket)
-- 
cgit v1.2.1-24-ge1ad