assorted small fixes, add some management infrastructure

[awsible] / sqs-action.py

diff --git a/sqs-action.py b/sqs-action.py
index 54f2eb7969cd48b4a879eeac8829dc4315d85b84..f092fd76b99dcb8d8c43abcf647933fee61bea5d 100755 (executable)
--- a/sqs-action.py
+++ b/sqs-action.py
@@ -62,12 +62,13 @@ def processMessage(message):
                 instanceState = ec2r.Instance(InstanceId).state['Name']
             except:
                 logging.debug('instance %s does not exist', InstanceId)
-                message.delete()
+                message.change_visibility(VisibilityTimeout=60 * 2)
             else:
                 if instanceState == 'running':
                     handleEvent(message, event, ASGName, InstanceId)
                 else:
                     logging.debug('instance %s is in state %s, will try again', InstanceId, instanceState)
+                    message.change_visibility(VisibilityTimeout=60 * 2)
         else:
             logging.debug('nothing to do for event %r', data)
             message.delete()