diff options
| author |   Asteroide <thomas.duval@orange.com> | 2018-03-22 16:34:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-22 16:34:37 +0000 |
| commit | a19855fbfe845104bbb73b53985fe0aa9b76ad4e (patch) | |
| tree | 594425476b38575252d5373e7e74926e459a03ed /moon_manager | |
| parent | f47c622a0823fb5267ae932a0555a70ce09d6e11 (diff) | |
| parent | e00cf747f5f0fedcdbefa3e73a695b9e204e7bfc (diff) | |
Merge "Fix a bug in Managr HTTP server"
Diffstat (limited to 'moon_manager')
| -rw-r--r-- | moon_manager/moon_manager/http_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
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...") |