Revision 85115c12 kamaki/clients/__init__.py
b/kamaki/clients/__init__.py | ||
---|---|---|
145 | 145 |
self.scheme, self.netloc = self._connection_info(url, path, params) |
146 | 146 |
|
147 | 147 |
def dump_log(self): |
148 |
plog = '\t[%s]' if self.LOG_PID else ''
|
|
148 |
plog = ('\t[%s]' % self) if self.LOG_PID else ''
|
|
149 | 149 |
sendlog.info('- - - - - - -') |
150 | 150 |
sendlog.info('%s %s://%s%s%s' % ( |
151 | 151 |
self.method, self.scheme, self.netloc, self.path, plog)) |
... | ... | |
182 | 182 |
wait = 0.03 * random() |
183 | 183 |
sleep(wait) |
184 | 184 |
keep_trying -= wait |
185 |
plog = '\t[%s]' if self.LOG_PID else ''
|
|
185 |
plog = ('\t[%s]' % self) if self.LOG_PID else ''
|
|
186 | 186 |
logmsg = 'Kamaki Timeout %s %s%s' % (self.method, self.path, plog) |
187 | 187 |
recvlog.debug(logmsg) |
188 | 188 |
raise ClientError('HTTPResponse takes too long - kamaki timeout') |
... | ... | |
244 | 244 |
data = '%s%s' % (self._content, plog) |
245 | 245 |
if self._token: |
246 | 246 |
data = data.replace(self._token, '...') |
247 |
sendlog.info(data)
|
|
248 |
sendlog.info('- - - - - - -')
|
|
247 |
recvlog.info(data)
|
|
248 |
recvlog.info('- - - - - - -')
|
|
249 | 249 |
break |
250 | 250 |
except Exception as err: |
251 | 251 |
if isinstance(err, HTTPException): |
... | ... | |
450 | 450 |
if data: |
451 | 451 |
headers.setdefault('Content-Length', '%s' % len(data)) |
452 | 452 |
|
453 |
plog = '\t[%s]' if self.LOG_PID else ''
|
|
453 |
plog = ('\t[%s]' % self) if self.LOG_PID else ''
|
|
454 | 454 |
sendlog.debug('\n\nCMT %s@%s%s', method, self.base_url, plog) |
455 | 455 |
req = RequestManager( |
456 | 456 |
method, self.base_url, path, |
Also available in: Unified diff