1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
|
package main
import (
"errors"
"fmt"
"log"
"os"
"regexp"
"time"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/aws/aws-sdk-go/service/sqs"
)
const PreprocPattern = `_bin[0-9].[0-9].png`
const HeartbeatTime = 60
type awsConn struct {
// these need to be set before running Init()
region string
logger *log.Logger
// these are used internally
sess *session.Session
s3svc *s3.S3
sqssvc *sqs.SQS
downloader *s3manager.Downloader
uploader *s3manager.Uploader
prequrl, ocrqurl, analysequrl string
}
func (a *awsConn) Init() error {
if a.region == "" {
return errors.New("No region set")
}
if a.logger == nil {
return errors.New("No logger set")
}
var err error
a.sess, err = session.NewSession(&aws.Config{
Region: aws.String(a.region),
})
if err != nil {
return errors.New(fmt.Sprintf("Failed to set up aws session: %s", err))
}
a.s3svc = s3.New(a.sess)
a.sqssvc = sqs.New(a.sess)
a.downloader = s3manager.NewDownloader(a.sess)
a.uploader = s3manager.NewUploader(a.sess)
a.logger.Println("Getting preprocess queue URL")
result, err := a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{
QueueName: aws.String("rescribepreprocess"),
})
if err != nil {
return errors.New(fmt.Sprintf("Error getting preprocess queue URL: %s", err))
}
a.prequrl = *result.QueueUrl
a.logger.Println("Getting OCR queue URL")
result, err = a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{
QueueName: aws.String("rescribeocr"),
})
if err != nil {
return errors.New(fmt.Sprintf("Error getting OCR queue URL: %s", err))
}
a.ocrqurl = *result.QueueUrl
a.logger.Println("Getting analyse queue URL")
result, err = a.sqssvc.GetQueueUrl(&sqs.GetQueueUrlInput{
QueueName: aws.String("rescribeanalyse"),
})
if err != nil {
return errors.New(fmt.Sprintf("Error getting analyse queue URL: %s", err))
}
a.analysequrl = *result.QueueUrl
return nil
}
func (a *awsConn) CheckQueue(url string) (Qmsg, error) {
msgResult, err := a.sqssvc.ReceiveMessage(&sqs.ReceiveMessageInput{
MaxNumberOfMessages: aws.Int64(1),
VisibilityTimeout: aws.Int64(HeartbeatTime * 2),
WaitTimeSeconds: aws.Int64(20),
QueueUrl: &url,
})
if err != nil {
return Qmsg{}, err
}
if len(msgResult.Messages) > 0 {
msg := Qmsg{Handle: *msgResult.Messages[0].ReceiptHandle, Body: *msgResult.Messages[0].Body}
a.logger.Println("Message received:", msg.Body)
return msg, nil
} else {
return Qmsg{}, nil
}
}
func (a *awsConn) CheckPreQueue() (Qmsg, error) {
a.logger.Println("Checking preprocessing queue for new messages")
return a.CheckQueue(a.prequrl)
}
func (a *awsConn) CheckOCRQueue() (Qmsg, error) {
a.logger.Println("Checking OCR queue for new messages")
return a.CheckQueue(a.ocrqurl)
}
func (a *awsConn) CheckAnalyseQueue() (Qmsg, error) {
a.logger.Println("Checking analyse queue for new messages")
return a.CheckQueue(a.ocrqurl)
}
func (a *awsConn) QueueHeartbeat(t *time.Ticker, msgHandle string, qurl string) error {
for _ = range t.C {
duration := int64(HeartbeatTime * 2)
_, err := a.sqssvc.ChangeMessageVisibility(&sqs.ChangeMessageVisibilityInput{
ReceiptHandle: &msgHandle,
QueueUrl: &qurl,
VisibilityTimeout: &duration,
})
if err != nil {
return errors.New(fmt.Sprintf("Heartbeat error updating queue duration: %s", err))
}
}
return nil
}
func (a *awsConn) PreQueueHeartbeat(t *time.Ticker, msgHandle string) error {
a.logger.Println("Starting preprocess queue heartbeat")
return a.QueueHeartbeat(t, msgHandle, a.prequrl)
}
func (a *awsConn) OCRQueueHeartbeat(t *time.Ticker, msgHandle string) error {
a.logger.Println("Starting ocr queue heartbeat")
return a.QueueHeartbeat(t, msgHandle, a.ocrqurl)
}
func (a *awsConn) ListObjects(bucket string, prefix string) ([]string, error) {
var names []string
err := a.s3svc.ListObjectsV2Pages(&s3.ListObjectsV2Input{
Bucket: aws.String(bucket),
Prefix: aws.String(prefix),
}, func(page *s3.ListObjectsV2Output, last bool) bool {
for _, r := range page.Contents {
names = append(names, *r.Key)
}
return true
})
return names, err
}
func (a *awsConn) ListToPreprocess(bookname string) ([]string, error) {
var names []string
preprocessed := regexp.MustCompile(PreprocPattern)
objs, err := a.ListObjects("rescribeinprogress", bookname)
if err != nil {
return names, err
}
// Filter out any object that looks like it's already been preprocessed
for _, n := range objs {
if preprocessed.MatchString(n) {
a.logger.Println("Skipping item that looks like it has already been processed", n)
continue
}
names = append(names, n)
}
return names, nil
}
func (a *awsConn) ListToOCR(bookname string) ([]string, error) {
var names []string
preprocessed := regexp.MustCompile(PreprocPattern)
objs, err := a.ListObjects("rescribeinprogress", bookname)
if err != nil {
return names, err
}
// Filter out any object that looks like it hasn't already been preprocessed
for _, n := range objs {
if !preprocessed.MatchString(n) {
a.logger.Println("Skipping item that looks like it is not preprocessed", n)
continue
}
names = append(names, n)
}
return names, nil
}
func (a *awsConn) AddToQueue(url string, msg string) error {
_, err := a.sqssvc.SendMessage(&sqs.SendMessageInput{
MessageBody: &msg,
QueueUrl: &url,
})
return err
}
func (a *awsConn) AddToOCRQueue(msg string) error {
return a.AddToQueue(a.ocrqurl, msg)
}
func (a *awsConn) AddToAnalyseQueue(msg string) error {
return a.AddToQueue(a.analysequrl, msg)
}
func (a *awsConn) DelFromQueue(url string, handle string) error {
_, err := a.sqssvc.DeleteMessage(&sqs.DeleteMessageInput{
QueueUrl: &url,
ReceiptHandle: &handle,
})
return err
}
func (a *awsConn) DelFromPreQueue(handle string) error {
return a.DelFromQueue(a.prequrl, handle)
}
func (a *awsConn) DelFromOCRQueue(handle string) error {
return a.DelFromQueue(a.ocrqurl, handle)
}
func (a *awsConn) Download(bucket string, key string, path string) error {
f, err := os.Create(path)
if err != nil {
return err
}
defer f.Close()
_, err = a.downloader.Download(f,
&s3.GetObjectInput{
Bucket: aws.String(bucket),
Key: &key,
})
return err
}
func (a *awsConn) DownloadFromInProgress(key string, path string) error {
a.logger.Println("Downloading", key)
return a.Download("rescribeinprogress", key, path)
}
func (a *awsConn) Upload(bucket string, key string, path string) error {
file, err := os.Open(path)
if err != nil {
log.Fatalln("Failed to open file", path, err)
}
defer file.Close()
_, err = a.uploader.Upload(&s3manager.UploadInput{
Bucket: aws.String(bucket),
Key: aws.String(key),
Body: file,
})
return err
}
func (a *awsConn) UploadToInProgress(key string, path string) error {
a.logger.Println("Uploading", path)
return a.Upload("rescribeinprogress", key, path)
}
func (a *awsConn) Logger() *log.Logger {
return a.logger
}
|
