Commit 86a50847 authored by Stavros Sachtouris's avatar Stavros Sachtouris
Browse files

Expand stream output to pithos print methods

parent a8262d20
...@@ -363,9 +363,9 @@ class file_list(_file_container_command, _optional_json, _name_filter): ...@@ -363,9 +363,9 @@ class file_list(_file_container_command, _optional_json, _name_filter):
enum=FlagArgument('Enumerate results', '--enumerate') enum=FlagArgument('Enumerate results', '--enumerate')
) )
def print_objects(self, object_list): def print_objects(self, object_list, out=stdout):
if self['json_output']: if self['json_output']:
print_json(object_list) print_json(object_list, out=out)
return return
limit = int(self['limit']) if self['limit'] > 0 else len(object_list) limit = int(self['limit']) if self['limit'] > 0 else len(object_list)
for index, obj in enumerate(object_list): for index, obj in enumerate(object_list):
...@@ -397,9 +397,9 @@ class file_list(_file_container_command, _optional_json, _name_filter): ...@@ -397,9 +397,9 @@ class file_list(_file_container_command, _optional_json, _name_filter):
if self['more']: if self['more']:
page_hold(index, limit, len(object_list)) page_hold(index, limit, len(object_list))
def print_containers(self, container_list): def print_containers(self, container_list, out=stdout):
if self['json_output']: if self['json_output']:
print_json(container_list) print_json(container_list, out=out)
return return
limit = int(self['limit']) if self['limit'] > 0\ limit = int(self['limit']) if self['limit'] > 0\
else len(container_list) else len(container_list)
...@@ -1615,10 +1615,10 @@ class file_permissions(_pithos_init): ...@@ -1615,10 +1615,10 @@ class file_permissions(_pithos_init):
""" """
def print_permissions(permissions_dict): def print_permissions(permissions_dict, out=stdout):
expected_keys = ('read', 'write') expected_keys = ('read', 'write')
if set(permissions_dict).issubset(expected_keys): if set(permissions_dict).issubset(expected_keys):
print_dict(permissions_dict) print_dict(permissions_dict, out=out)
else: else:
invalid_keys = set(permissions_dict.keys()).difference(expected_keys) invalid_keys = set(permissions_dict.keys()).difference(expected_keys)
raiseCLIError( raiseCLIError(
...@@ -2071,10 +2071,12 @@ class file_sharers(_file_account_command, _optional_json): ...@@ -2071,10 +2071,12 @@ class file_sharers(_file_account_command, _optional_json):
self._run() self._run()
def version_print(versions): def version_print(versions, out=stdout):
print_items([dict(id=vitem[0], created=strftime( print_items(
'%d-%m-%Y %H:%M:%S', [dict(id=vitem[0], created=strftime(
localtime(float(vitem[1])))) for vitem in versions]) '%d-%m-%Y %H:%M:%S',
localtime(float(vitem[1])))) for vitem in versions],
out=out)
@command(pithos_cmds) @command(pithos_cmds)
......
...@@ -149,10 +149,8 @@ class RequestManager(Logged): ...@@ -149,10 +149,8 @@ class RequestManager(Logged):
sendlog.info('%s %s://%s%s%s' % ( sendlog.info('%s %s://%s%s%s' % (
self.method, self.scheme, self.netloc, self.path, plog)) self.method, self.scheme, self.netloc, self.path, plog))
for key, val in self.headers.items(): for key, val in self.headers.items():
#if (not self.LOG_TOKEN) and key.lower() == 'x-auth-token':
# continue
show = (key.lower() != 'x-auth-token') or self.LOG_TOKEN show = (key.lower() != 'x-auth-token') or self.LOG_TOKEN
sendlog.info(' %s: %s%s' % (key, val if show else '', plog)) sendlog.info(' %s: %s%s' % (key, val if show else '...', plog))
if self.data: if self.data:
sendlog.info('data size:%s%s' % (len(self.data), plog)) sendlog.info('data size:%s%s' % (len(self.data), plog))
if self.LOG_DATA: if self.LOG_DATA:
...@@ -230,12 +228,11 @@ class ResponseManager(Logged): ...@@ -230,12 +228,11 @@ class ResponseManager(Logged):
self.status_code, self.status, plog)) self.status_code, self.status, plog))
self._headers = dict() self._headers = dict()
for k, v in r.getheaders(): for k, v in r.getheaders():
if (not self.LOG_TOKEN) and ( show = (k.lower() != 'x-auth-token') or self.LOG_TOKEN
k.lower() == 'x-auth-token'):
continue
v = unquote(v) v = unquote(v)
self._headers[k] = v self._headers[k] = v
recvlog.info(' %s: %s%s' % (k, v, plog)) recvlog.info(' %s: %s%s' % (
k, v if show else '...', plog))
self._content = r.read() self._content = r.read()
recvlog.info('data size: %s%s' % ( recvlog.info('data size: %s%s' % (
len(self._content) if self._content else 0, plog)) len(self._content) if self._content else 0, plog))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment