Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion multi_sqs_listener/_long_polling.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ def __init__(self, thread_id, queue_name, outbound_bus, run_event,
self.thread_id = thread_id
self._region_name = kwargs['region_name'] if 'region_name' in kwargs else 'eu-west-1'
self._queue_acct_id = kwargs.get('queue_acct_id')
self._endpoint_url = kwargs.get('endpoint_url')
self._outbound_bus = outbound_bus
self._queue_name = queue_name
self._handler_available_event = handler_available_event
sqs = boto3.resource('sqs', region_name=self._region_name)
sqs = boto3.resource('sqs', region_name=self._region_name, endpoint_url=self._endpoint_url)
if self._queue_acct_id is not None:
self._queue = sqs.get_queue_by_name(QueueName=self._queue_name, QueueOwnerAWSAccountId=self._queue_acct_id)
else:
Expand Down
3 changes: 2 additions & 1 deletion multi_sqs_listener/_short_polling.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ def __init__(self, thread_id, queue_name, outbound_bus, run_event,
self.thread_id = thread_id
self._region_name = kwargs['region_name'] if 'region_name' in kwargs else 'eu-west-1'
self._queue_acct_id = kwargs.get('queue_acct_id')
self._endpoint_url = kwargs.get('endpoint_url')
self._outbound_bus = outbound_bus
self._queue_name = queue_name
self._poll_interval = poll_interval
self._handler_available_event = handler_available_event
sqs = boto3.resource('sqs', region_name=self._region_name)
sqs = boto3.resource('sqs', region_name=self._region_name, endpoint_url=self._endpoint_url)
if self._queue_acct_id is not None:
self._queue = sqs.get_queue_by_name(QueueName=self._queue_name, QueueOwnerAWSAccountId=self._queue_acct_id)
else:
Expand Down
1 change: 1 addition & 0 deletions multi_sqs_listener/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def __init__(self, queue_name, bus, **kwargs):
self.queue_type = kwargs['queue_type'] if 'queue_type' in kwargs else 'long-poll'
self.region_name = kwargs['region_name'] if 'region_name' in kwargs else 'eu-west-1'
self.queue_acct_id = kwargs.get('queue_acct_id')
self.endpoint_url = kwargs.get('endpoint_url')

# Only for short polling queues
self.poll_interval = kwargs['poll_interval'] if 'poll_interval' in kwargs else 60
Expand Down
7 changes: 5 additions & 2 deletions multi_sqs_listener/multi_sqs_listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ def _start_listeners(self):
run_event,
handler_available_event,
region_name=queue.region_name,
queue_acct_id=queue.queue_acct_id
queue_acct_id=queue.queue_acct_id,
endpoint_url=queue.endpoint_url
)
else:
listener_thread = _ShortPollSQSListener(
Expand All @@ -59,7 +60,8 @@ def _start_listeners(self):
handler_available_event,
queue.poll_interval,
region_name=queue.region_name,
queue_acct_id=queue.queue_acct_id
queue_acct_id=queue.queue_acct_id,
endpoint_url=queue.endpoint_url
)
listener_thread.start()
threads.append(listener_thread)
Expand All @@ -74,6 +76,7 @@ def _start_listeners(self):
message = bus.get().get(block=False)
handler_available_event.clear()
try:
logger.info("Message received - {}".format(message[0]))
self.handle_message(message[0], bus.name, bus.priority, message[1])
a_message_was_processed = True
# If handle message worked, then delete the message from SQS
Expand Down