diff --git a/slack-bot/traffic-scraper/prd/receiveFromSQS.py b/slack-bot/traffic-scraper/prd/receiveFromSQS.py index fec997d..affa03a 100644 --- a/slack-bot/traffic-scraper/prd/receiveFromSQS.py +++ b/slack-bot/traffic-scraper/prd/receiveFromSQS.py @@ -15,6 +15,15 @@ class receiveFromSQS(object): session = boto3.Session(profile_name=profileName) return cls(session, queueURL) + def _receiveSQSMessage(self, maxNumberOfMessages=10): + response = self.sqs\ + .receive_message(QueueUrl=self.queueURL, + MaxNumberOfMessages=maxNumberOfMessages) + return response + + def _extractMessageFromSQS(self): + pass + def receiveMessage(self, b64=True, MaxNumberOfMessages=10, delete=False, endString='END'): while True: @@ -37,6 +46,10 @@ class receiveFromSQS(object): print('Queue is empty') break + def receiveAllMessages(self, b64=True, delete=None): + while True: + self.response = self._receiveSQSMessage() + inst = receiveFromSQS.createSession(profileName='plex-aws', queueURL='https://sqs.eu-west-1.amazonaws' diff --git a/slack-bot/traffic-scraper/prd/sendToSQS.py b/slack-bot/traffic-scraper/prd/sendToSQS.py index 9d5b479..0ffab11 100644 --- a/slack-bot/traffic-scraper/prd/sendToSQS.py +++ b/slack-bot/traffic-scraper/prd/sendToSQS.py @@ -21,11 +21,11 @@ class sendToSQS(object): session = boto3.Session(profile_name=profileName) return cls(session, queueURL) - def sendMessage(self, message, messageGroupId, b64=True, dedup=True): - currentTime = datetime.now().strftime('%H:%M:%S') + def sendMessage(self, message, messageGroupId, b64=True, dedup=False): + currentTime = datetime.now().strftime('%H:%M:%S.%f') if b64: message = (base64.b64encode(message.encode())).decode() - if dedup: + if not dedup: dedupId = hashlib.md5((message + currentTime).encode()).hexdigest() msg = self.sqs.send_message(QueueUrl=self.queueURL, MessageBody=message,