Revision 20211cbb
| b/kamaki/clients/astakos/__init__.py | ||
|---|---|---|
| 35 | 35 |
from astakosclient import AstakosClient as SynnefoAstakosClientOrig |
| 36 | 36 |
from astakosclient import AstakosClientException as SynnefoAstakosClientError |
| 37 | 37 |
|
| 38 |
from kamaki.clients import ( |
|
| 39 |
Client, ClientError, Logged, RequestManager, recvlog) |
|
| 38 |
from kamaki.clients import Client, ClientError, RequestManager, recvlog |
|
| 40 | 39 |
|
| 41 | 40 |
|
| 42 | 41 |
def _astakos_error(foo): |
| ... | ... | |
| 48 | 47 |
return wrap |
| 49 | 48 |
|
| 50 | 49 |
|
| 51 |
class SynnefoAstakosClient(SynnefoAstakosClientOrig, Logged):
|
|
| 50 |
class SynnefoAstakosClient(SynnefoAstakosClientOrig): |
|
| 52 | 51 |
"""A synnefo astakosclient.AstakosClient wrapper, that logs""" |
| 53 | 52 |
|
| 54 | 53 |
def _dump_response(self, request, status, message, data): |
| 55 |
plog = '' |
|
| 56 |
if self.LOG_PID: |
|
| 57 |
recvlog.info('\n%s <-- [req: %s]\n' % (self, request))
|
|
| 58 |
plog = '\t[%s]' % self |
|
| 59 |
recvlog.info('%d %s%s' % (status, message, plog))
|
|
| 60 |
recvlog.info('data size: %s%s' % (len(data), plog))
|
|
| 61 |
if self.LOG_DATA and data: |
|
| 62 |
data = '%s%s' % (data, plog) |
|
| 63 |
if not self.LOG_TOKEN: |
|
| 64 |
token = request.headers.get('X-Auth-Token', '')
|
|
| 65 |
if token: |
|
| 66 |
data = data.replace(token, '...') |
|
| 67 |
recvlog.info(data) |
|
| 68 |
recvlog.info('- - - - - - -')
|
|
| 54 |
recvlog.info('\n%d %s' % (status, message))
|
|
| 55 |
recvlog.info('data size: %s' % len(data))
|
|
| 56 |
token = request.headers.get('X-Auth-Token', '')
|
|
| 57 |
data = data.replace(token, '...') if token else data |
|
| 58 |
recvlog.info('%s\n- - - - - - -' % data)
|
|
| 69 | 59 |
|
| 70 | 60 |
def _call_astakos(self, *args, **kwargs): |
| 71 | 61 |
r = super(SynnefoAstakosClient, self)._call_astakos(*args, **kwargs) |
| ... | ... | |
| 86 | 76 |
status=log_response['status'], |
| 87 | 77 |
message=log_response['message'], |
| 88 | 78 |
data=log_response.get('data', ''))
|
| 89 |
except Exception as e:
|
|
| 90 |
print 'GOT EXCEPTION', e
|
|
| 79 |
except Exception: |
|
| 80 |
pass
|
|
| 91 | 81 |
finally: |
| 92 | 82 |
return r |
| 93 | 83 |
|
Also available in: Unified diff