improve catching error in autoscaling scheduler

diodonfrost · Jul 3, 2019 · d41ef2a · d41ef2a
1 parent f74dcd5
commit d41ef2a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/package/autoscaling_handler.py b/package/autoscaling_handler.py
@@ -40,7 +40,7 @@ def autoscaling_schedule(schedule_action, tag_key, tag_value):
                 error_code = e.response["Error"]["Code"]
                 if error_code == "UnsupportedOperation":
                     logging.warning(
-                        "%s is a spot instance and can not be stopped", ec2_instance
+                        "%s is a spot instance and cannot be stopped", ec2_instance
                     )
                 else:
                     logging.error("Unexpected error: %s" % e)
@@ -63,9 +63,9 @@ def autoscaling_schedule(schedule_action, tag_key, tag_value):
                 print("Start autoscaling instances {0}".format(ec2_instance))
             except ClientError as e:
                 error_code = e.response["Error"]["Code"]
-                if error_code == "UnsupportedOperation":
-                    logging.warning(
-                        "%s is a spot instance and can not be started", ec2_instance
+                if error_code == "IncorrectInstanceState":
+                    logging.info(
+                        "%s is not in a state from which it can be started", ec2_instance
                     )
                 else:
                     logging.error("Unexpected error: %s" % e)