Merge branch 'bobthe' into tutorial

application.py

@@ -1,10 +1,15 @@
 import logging
+import os
 
 from app import app as application
+from data.model import db as model_db
 
 
-logging.basicConfig(**application.config['LOGGING_CONFIG'])
+# Initialize logging
+application.config['LOGGING_CONFIG']()
 
+# Turn off debug logging for boto
+logging.getLogger('boto').setLevel(logging.CRITICAL)
 
 from endpoints.api import api
 from endpoints.index import index
@@ -29,6 +34,16 @@ application.register_blueprint(api, url_prefix='/api')
 application.register_blueprint(webhooks, url_prefix='/webhooks')
 application.register_blueprint(realtime, url_prefix='/realtime')
 
+
+def close_db(exc):
+  db = model_db
+  if not db.is_closed():
+    logger.debug('Disconnecting from database.')
+    db.close()
+
+application.teardown_request(close_db)
+
+
 # Remove this for prod config
 application.debug = True