better custom resource exception handling

CloudSnorkel · Apr 29, 2020 · d8c09a6 · d8c09a6
1 parent 03b2c79
commit d8c09a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/CloudWatch2S3-additional-account.template b/CloudWatch2S3-additional-account.template
@@ -128,9 +128,13 @@ Resources:
 
                         cfnresponse.send(event, context, cfnresponse.SUCCESS, {}, "ok")
 
-                    except:
-                        traceback.print_last()
-                        cfnresponse.send(event, context, cfnresponse.FAILED, {}, "ok")
+                    except Exception as e:
+                        try:
+                            traceback.print_last()
+                        except ValueError:
+                            print("Caught exception but unable to print stack trace")
+                            print(e)
+                        cfnresponse.send(event, context, cfnresponse.FAILED, {}, "fail")
 
                 else:
                     # other call

diff --git a/CloudWatch2S3.template b/CloudWatch2S3.template
@@ -689,9 +689,13 @@ Resources:
 
                         cfnresponse.send(event, context, cfnresponse.SUCCESS, {}, "ok")
 
-                    except:
-                        traceback.print_last()
-                        cfnresponse.send(event, context, cfnresponse.FAILED, {}, "ok")
+                    except Exception as e:
+                        try:
+                            traceback.print_last()
+                        except ValueError:
+                            print("Caught exception but unable to print stack trace")
+                            print(e)
+                        cfnresponse.send(event, context, cfnresponse.FAILED, {}, "fail")
 
                 else:
                     # other call