From: Thomas Duval <thomas.duval@orange.com>
Date: Thu, 22 Mar 2018 16:33:21 +0000 (+0100)
Subject: Fix a bug in Managr HTTP server
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e00cf747f5f0fedcdbefa3e73a695b9e204e7bfc;p=moon.git

Fix a bug in Managr HTTP server

Change-Id: If29c9971e171e78e20aa02a3bff1b01ec46e6e30
---

diff --git a/moon_manager/moon_manager/http_server.py b/moon_manager/moon_manager/http_server.py
index 128d5b74..a7258a75 100644
--- a/moon_manager/moon_manager/http_server.py
+++ b/moon_manager/moon_manager/http_server.py
@@ -100,7 +100,7 @@ class Root(Resource):
                 if _method in dir(item):
                     _methods.append(_method)
             tree[item.__name__]["methods"] = _methods
-            tree[item.__name__]["description"] = item.__doc__.strip()
+            tree[item.__name__]["description"] = item.__doc__.strip() if item.__doc__ else ""
         return {
             "version": __version__,
             "tree": tree
@@ -147,7 +147,7 @@ class HTTPServer(Server):
         while True:
             try:
                 PDPManager.get_pdp(user_id="admin", pdp_id=None)
-            except sqlalchemy.exc.ProgrammingError:
+            except (sqlalchemy.exc.ProgrammingError, sqlalchemy.exc.InternalError):
                 time.sleep(1)
                 if first:
                     logger.warning("Waiting for the database...")