Merge pull request GoogleCloudPlatform#108 from GoogleCloudPlatform/errors

waprin · web-flow · commit 65f77a1f5f2a · 2016-12-19T17:14:51.000-08:00
Add Stackdriver Error Reporting
diff --git a/5-logging/bookshelf/__init__.py b/5-logging/bookshelf/__init__.py
@@ -16,6 +16,7 @@
 import logging
 
 from flask import current_app, Flask, redirect, request, session, url_for
+from google.cloud import error_reporting
 import google.cloud.logging
 import httplib2
 from oauth2client.contrib.flask_util import UserOAuth2
@@ -70,15 +71,17 @@ def logout():
     def index():
         return redirect(url_for('crud.list'))
 
-    # Add an error handler. This is useful for debugging the live application,
-    # however, you should disable the output of the exception for production
-    # applications.
+    # Add an error handler that reports exceptions to Stackdriver Error
+    # Reporting. Note that this error handler is only used when debug
+    # is False
     @app.errorhandler(500)
     def server_error(e):
+        client = error_reporting.Client(app.config['PROJECT_ID'])
+        client.report_exception(
+            http_context=error_reporting.build_flask_context(request))
         return """
-        An internal error occurred: <pre>{}</pre>
-        See logs for full stacktrace.
-        """.format(e), 500
+        An internal error occurred.
+        """, 500
 
     return app
 
diff --git a/6-pubsub/bookshelf/__init__.py b/6-pubsub/bookshelf/__init__.py
@@ -16,6 +16,7 @@
 import logging
 
 from flask import current_app, Flask, redirect, request, session, url_for
+from google.cloud import error_reporting
 import google.cloud.logging
 import httplib2
 from oauth2client.contrib.flask_util import UserOAuth2
@@ -68,15 +69,17 @@ def logout():
     def index():
         return redirect(url_for('crud.list'))
 
-    # Add an error handler. This is useful for debugging the live application,
-    # however, you should disable the output of the exception for production
-    # applications.
+    # Add an error handler that reports exceptions to Stackdriver Error
+    # Reporting. Note that this error handler is only used when debug
+    # is False
     @app.errorhandler(500)
     def server_error(e):
+        client = error_reporting.Client(app.config['PROJECT_ID'])
+        client.report_exception(
+            http_context=error_reporting.build_flask_context(request))
         return """
-        An internal error occurred: <pre>{}</pre>
-        See logs for full stacktrace.
-        """.format(e), 500
+        An internal error occurred.
+        """, 500
 
     return app
 
diff --git a/7-gce/bookshelf/__init__.py b/7-gce/bookshelf/__init__.py
@@ -16,6 +16,7 @@
 import logging
 
 from flask import current_app, Flask, redirect, request, session, url_for
+from google.cloud import error_reporting
 import google.cloud.logging
 import httplib2
 from oauth2client.contrib.flask_util import UserOAuth2
@@ -77,15 +78,17 @@ def logout():
     def index():
         return redirect(url_for('crud.list'))
 
-    # Add an error handler. This is useful for debugging the live application,
-    # however, you should disable the output of the exception for production
-    # applications.
+    # Add an error handler that reports exceptions to Stackdriver Error
+    # Reporting. Note that this error handler is only used when Debug
+    # is False
     @app.errorhandler(500)
     def server_error(e):
+        client = error_reporting.Client(app.config['PROJECT_ID'])
+        client.report_exception(
+            http_context=error_reporting.build_flask_context(request))
         return """
-        An internal error occurred: <pre>{}</pre>
-        See logs for full stacktrace.
-        """.format(e), 500
+        An internal error occurred.
+        """, 500
 
     return app
 
