Commit 676bb9c5 authored by Andreas Jung's avatar Andreas Jung

catching exception in queueLength() if the configured

queue directory causes an error
parent 9747ecc5
...@@ -95,6 +95,9 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager): ...@@ -95,6 +95,9 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager):
+OFS.SimpleItem.Item.manage_options +OFS.SimpleItem.Item.manage_options
) )
def __setstate__(self, state):
import pdb; pdb.set_trace()
def __init__(self, id='', title='', smtp_host='localhost', smtp_port=25, def __init__(self, id='', title='', smtp_host='localhost', smtp_port=25,
force_tls=False, force_tls=False,
...@@ -232,8 +235,12 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager): ...@@ -232,8 +235,12 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager):
def queueLength(self): def queueLength(self):
""" return length of mail queue """ """ return length of mail queue """
maildir = Maildir(self.smtp_queue_directory) try:
return len([item for item in maildir]) maildir = Maildir(self.smtp_queue_directory)
return len([item for item in maildir])
except ValueError:
return 'n/a - %s is not a maildir - please verify your ' \
'configuration' % self.smtp_queue_directory
security.declareProtected(view, 'queueThreadAlive') security.declareProtected(view, 'queueThreadAlive')
......
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