[gen] Bugfixes in mail and ldap configs.
This commit is contained in:
parent
bfb10675de
commit
9566a7d788
3 changed files with 8 additions and 3 deletions
|
@ -336,7 +336,7 @@ class ZopeInstaller:
|
|||
if not getattr(cfg, sv): continue
|
||||
svConfig = getattr(cfg, sv)
|
||||
enabled = svConfig.enabled and 'enabled' or 'disabled'
|
||||
servers.append('%s (%s, %s)' % (svConfig.server, sv, enabled))
|
||||
servers.append('%s (%s, %s)' % (svConfig, sv, enabled))
|
||||
if servers:
|
||||
self.logger.info('server(s) %s configured.' % ', '.join(servers))
|
||||
|
||||
|
|
|
@ -125,5 +125,5 @@ def sendMail(config, to, subject, body, attachments=None, log=None):
|
|||
log('%s: mail sending failed (%s)' % (config, str(e)), type='error')
|
||||
except socket.error, se:
|
||||
if log:
|
||||
log('%s: mail sending failed (%s)' % (config, str(e)), type='error')
|
||||
log('%s: mail sending failed (%s)' % (config, str(se)),type='error')
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue