Revision f6ff4b40
| b/snf-cyclades-app/synnefo/api/util.py | ||
|---|---|---|
| 470 | 470 |
resp = func(request, *args, **kwargs) |
| 471 | 471 |
update_response_headers(request, resp) |
| 472 | 472 |
return resp |
| 473 |
except NotAllowedError: |
|
| 474 |
# Image Backend Unathorized |
|
| 475 |
fault = faults.Forbidden('Request not allowed.')
|
|
| 476 |
return render_fault(request, fault) |
|
| 477 | 473 |
except faults.Fault, fault: |
| 478 | 474 |
if fault.code >= 500: |
| 479 | 475 |
log.exception('API fault')
|
| b/snf-cyclades-app/synnefo/plankton/backend.py | ||
|---|---|---|
| 60 | 60 |
|
| 61 | 61 |
from django.conf import settings |
| 62 | 62 |
|
| 63 |
from pithos.backends.base import NotAllowedError as PithosNotAllowedError
|
|
| 63 |
from pithos.backends.base import NotAllowedError |
|
| 64 | 64 |
|
| 65 | 65 |
import synnefo.lib.astakos as lib_astakos |
| 66 | 66 |
import logging |
| ... | ... | |
| 113 | 113 |
pass |
| 114 | 114 |
|
| 115 | 115 |
|
| 116 |
class NotAllowedError(BackendException): |
|
| 117 |
pass |
|
| 118 |
|
|
| 119 |
|
|
| 120 | 116 |
from pithos.backends.util import PithosBackendPool |
| 121 | 117 |
POOL_SIZE = 8 |
| 122 | 118 |
_pithos_backend_pool = \ |
| ... | ... | |
| 139 | 135 |
def wrapper(*args, **kwargs): |
| 140 | 136 |
try: |
| 141 | 137 |
return func(*args, **kwargs) |
| 142 |
except PithosNotAllowedError:
|
|
| 143 |
raise NotAllowedError()
|
|
| 138 |
except NotAllowedError: |
|
| 139 |
raise faults.Forbidden("Request not allowed")
|
|
| 144 | 140 |
return wrapper |
| 145 | 141 |
|
| 146 | 142 |
|
Also available in: Unified diff