Revision 726cb37f snf-django-lib/snf_django/lib/api/__init__.py

b/snf-django-lib/snf_django/lib/api/__init__.py
90 90
                if user_required:
91 91
                    assert(token_required), "Can not get user without token"
92 92
                    astakos = astakos_url or settings.ASTAKOS_URL
93
                    try:
94
                        astakos = AstakosClient(astakos,
95
                                                use_pool=True,
96
                                                logger=logger)
97
                        user_info = astakos.get_user_info(token)
98
                    except AstakosClientException as err:
99
                        raise faults.Fault(message=err.message,
100
                                           details=err.details,
101
                                           code=err.status)
93
                    astakos = AstakosClient(astakos,
94
                                            use_pool=True,
95
                                            logger=logger)
96
                    user_info = astakos.get_user_info(token)
102 97
                    request.user_uniq = user_info["uuid"]
103 98
                    request.user = user_info
104 99

  
......
112 107
                if fault.code >= 500:
113 108
                    logger.exception("API ERROR")
114 109
                return render_fault(request, fault)
110
            except AstakosClientException as err:
111
                fault = faults.Fault(message=err.message,
112
                                     details=err.details,
113
                                     code=err.status)
114
                if fault.code >= 500:
115
                    logger.exception("API ERROR")
116
                return render_fault(request, fault)
115 117
            except:
116 118
                logger.exception("Unexpected ERROR")
117 119
                fault = faults.InternalServerError("Unexpected ERROR")

Also available in: Unified diff