Merge "subprocess.call para stdout=PIPE is risky"

[yardstick.git] / api / server.py

diff --git a/api/server.py b/api/server.py
index 3f104c6..fac821b 100644 (file)
--- a/api/server.py
+++ b/api/server.py
@@ -10,7 +10,10 @@ import logging
 
 from flask import Flask
 from flask_restful import Api
+from flasgger import Swagger
 
+from api.database import init_db
+from api.database import db_session
 from api.urls import urlpatterns
 from yardstick import _init_logging
 
@@ -18,8 +21,18 @@ logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
 
+init_db()
+
+Swagger(app)
+
 api = Api(app)
 
+
+@app.teardown_request
+def shutdown_session(exception=None):
+    db_session.remove()
+
+
 reduce(lambda a, b: a.add_resource(b.resource, b.url,
                                    endpoint=b.endpoint) or a, urlpatterns, api)