D577.1775250097.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D577.1775250097.diff
View Options

	diff --git a/pykolab/logger.py b/pykolab/logger.py
	--- a/pykolab/logger.py
	+++ b/pykolab/logger.py
	@@ -27,6 +27,22 @@

	from pykolab.translate import _

	+class StderrToLogger(object):
	+ """
	+ Fake file-like stream object that redirects writes to a logger instance.
	+ """
	+ def __init__(self, logger, log_level=logging.DEBUG):
	+ self.logger = logger
	+ self.log_level = log_level
	+ self.linebuf = ''
	+
	+ def write(self, buf):
	+ for line in buf.rstrip().splitlines():
	+ self.logger.log(self.log_level, line.rstrip())
	+
	+ def flush(self):
	+ pass
	+
	class Logger(logging.Logger):
	"""
	The PyKolab version of a logger.
	diff --git a/wallace/modules.py b/wallace/modules.py
	--- a/wallace/modules.py
	+++ b/wallace/modules.py
	@@ -20,7 +20,6 @@
	import os
	import sys
	import time
	-import traceback

	from email import message_from_string
	from email.message import Message
	@@ -130,6 +129,10 @@
	def _sendmail(sender, recipients, msg):
	# NOTE: Use "127.0.0.1" here for IPv6 (see also the service
	# definition in master.cf).
	+
	+ sl = pykolab.logger.StderrToLogger(log)
	+ smtplib.stderr = sl
	+
	smtp = smtplib.SMTP("127.0.0.1", 10027)

	if conf.debuglevel > 8:
	@@ -169,8 +172,7 @@
	log.error("SMTP Sender Refused, %r" % (errmsg))

	except Exception, errmsg:
	- log.error(_("Unknown error occurred; %r") % (errmsg))
	- log.error("%r" % (traceback.format_exc()))
	+ log.exception(_("Unknown error occurred: %r") % (errmsg))

	return False