tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore previous MachineUI output a bit more

Browse Source 
The logging rework led to multipline output as we stopped urlencoding
the output lines. Urrg. Fixed this, so output is urlencoded again.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2012-01-06 23:40:31 +01:00
parent 17f60f7233
commit 946386a8e7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
offlineimap/ui/Machine.py
View File

@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
from urllib import urlencode
import sys import sys
import time import time
import logging import logging
@ -23,15 +23,24 @@ import offlineimap
protocol = '7.0.0' protocol = '7.0.0'
class MachineLogFormatter(logging.Formatter):
"""urlencodes any outputted line, to avoid multi-line output"""
def format(self, record):
# urlencode the "mesg" attribute and append to regular line...
line = super(MachineLogFormatter, self).format(record)
return line + urlencode([('', record.mesg)])[1:]
class MachineUI(UIBase): class MachineUI(UIBase):
def __init__(self, config, loglevel = logging.INFO): def __init__(self, config, loglevel = logging.INFO):
super(MachineUI, self).__init__(config, loglevel) super(MachineUI, self).__init__(config, loglevel)
self._log_con_handler.createLock() self._log_con_handler.createLock()
"""lock needed to block on password input""" """lock needed to block on password input"""
# Set up the formatter that urlencodes the strings...
self._log_con_handler.setFormatter(MachineLogFormatter())
def _printData(self, command, msg): def _printData(self, command, msg):
self.logger.info("%s:%s:%s:%s" % ( self.logger.info("%s:%s:%s" % (
'msg', command, currentThread().getName(), msg)) 'msg', command, currentThread().getName()), extra={'mesg': msg})
def _msg(s, msg): def _msg(s, msg):
s._printData('_display', msg) s._printData('_display', msg)