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

[yardstick.git] / api / server.py

diff --git a/api/server.py b/api/server.py
index d0e4d30..fac821b 100644 (file)
--- a/api/server.py
+++ b/api/server.py
@@ -1,19 +1,43 @@
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 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
 
 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)
 
 if __name__ == '__main__':
+    _init_logging()
+    logger.setLevel(logging.DEBUG)
     logger.info('Starting server')
     app.run(host='0.0.0.0')