Commit f2d22c13 by Victor Schröder

Fixes error messages to mention ElastiCache

parent e8c3e3d6
...@@ -447,7 +447,7 @@ class Ec2Inventory(object): ...@@ -447,7 +447,7 @@ class Ec2Inventory(object):
if e.error_code == 'AuthFailure': if e.error_code == 'AuthFailure':
error = self.get_auth_error_message() error = self.get_auth_error_message()
if not e.reason == "Forbidden": if not e.reason == "Forbidden":
error = "Looks like AWS RDS is down:\n%s" % e.message error = "Looks like AWS ElastiCache is down:\n%s" % e.message
self.fail_with_error(error) self.fail_with_error(error)
try: try:
...@@ -481,7 +481,7 @@ class Ec2Inventory(object): ...@@ -481,7 +481,7 @@ class Ec2Inventory(object):
if e.error_code == 'AuthFailure': if e.error_code == 'AuthFailure':
error = self.get_auth_error_message() error = self.get_auth_error_message()
if not e.reason == "Forbidden": if not e.reason == "Forbidden":
error = "Looks like AWS RDS is down:\n%s" % e.message error = "Looks like AWS ElastiCache [Replication Groups] is down:\n%s" % e.message
self.fail_with_error(error) self.fail_with_error(error)
try: try:
...@@ -491,7 +491,7 @@ class Ec2Inventory(object): ...@@ -491,7 +491,7 @@ class Ec2Inventory(object):
replication_groups = response['DescribeReplicationGroupsResponse']['DescribeReplicationGroupsResult']['ReplicationGroups'] replication_groups = response['DescribeReplicationGroupsResponse']['DescribeReplicationGroupsResult']['ReplicationGroups']
except KeyError as e: except KeyError as e:
error = "ElastiCache query to AWS failed (unexpected format)." error = "ElastiCache [Replication Groups] query to AWS failed (unexpected format)."
self.fail_with_error(error) self.fail_with_error(error)
for replication_group in replication_groups: for replication_group in replication_groups:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment