1 files changed, 9 insertions, 0 deletions
diff --git a/api/server.py b/api/server.py
index 64a2b4f96..fac821b00 100644
--- a/api/server.py
+++ b/api/server.py
@@ -12,6 +12,8 @@ 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
 
@@ -19,11 +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)