andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Log multi-line responses in a readable way

Browse Source
This commit is contained in:
Stein Magnus Jodal 2009-12-26 14:06:41 +01:00
parent 950552a503
commit 7c2abacd6f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mopidy/session.py
View File

@ -7,6 +7,15 @@ from mopidy.handler import MpdHandler
logger = logging.getLogger(u'session') logger = logging.getLogger(u'session')
def indent(string, places=4, linebreak=settings.MPD_LINE_TERMINATOR):
lines = string.split(linebreak)
if len(lines) == 1:
return string
result = u''
for line in lines:
result += linebreak + ' ' * places + line
return result
class MpdSession(asynchat.async_chat): class MpdSession(asynchat.async_chat):
def __init__(self, server, client_socket, client_address, backend, def __init__(self, server, client_socket, client_address, backend,
handler_class=MpdHandler): handler_class=MpdHandler):
@ -33,7 +42,7 @@ class MpdSession(asynchat.async_chat):
data = ''.join(self.input_buffer).strip() data = ''.join(self.input_buffer).strip()
self.input_buffer = [] self.input_buffer = []
input = data.decode(settings.MPD_LINE_ENCODING) input = data.decode(settings.MPD_LINE_ENCODING)
logger.debug(u'Input: %s', input) logger.debug(u'Input: %s', indent(input))
self.handle_request(input) self.handle_request(input)
def handle_request(self, input): def handle_request(self, input):
@ -45,11 +54,10 @@ class MpdSession(asynchat.async_chat):
return self.send_response(u'ACK %s' % e) return self.send_response(u'ACK %s' % e)
def handle_response(self, response): def handle_response(self, response):
for line in response: self.send_response(settings.MPD_LINE_TERMINATOR.join(response))
self.send_response(line)
def send_response(self, output): def send_response(self, output):
logger.debug(u'Output: %s', output) logger.debug(u'Output: %s', indent(output))
output = u'%s%s' % (output, settings.MPD_LINE_TERMINATOR) output = u'%s%s' % (output, settings.MPD_LINE_TERMINATOR)
data = output.encode(settings.MPD_LINE_ENCODING) data = output.encode(settings.MPD_LINE_ENCODING)
self.push(data) self.push(data)