Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
092dee5d
Commit
092dee5d
authored
Aug 19, 2007
by
Andreas Jung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some cleanup
parent
96c76ebc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
lib/python/Products/MailHost/MailHost.py
lib/python/Products/MailHost/MailHost.py
+4
-5
No files found.
lib/python/Products/MailHost/MailHost.py
View file @
092dee5d
...
@@ -18,6 +18,7 @@ $Id$
...
@@ -18,6 +18,7 @@ $Id$
import
mimetools
import
mimetools
import
rfc822
import
rfc822
import
time
import
time
import
logging
from
cStringIO
import
StringIO
from
cStringIO
import
StringIO
import
Acquisition
import
Acquisition
...
@@ -37,7 +38,9 @@ from zope.sendmail.delivery import DirectMailDelivery, QueuedMailDelivery, \
...
@@ -37,7 +38,9 @@ from zope.sendmail.delivery import DirectMailDelivery, QueuedMailDelivery, \
from
interfaces
import
IMailHost
from
interfaces
import
IMailHost
queue_threads
=
{}
queue_threads
=
{}
# maps MailHost path -> queue processor threada
LOG
=
logging
.
getLogger
(
'MailHost'
)
class
MailHostError
(
Exception
):
class
MailHostError
(
Exception
):
pass
pass
...
@@ -199,9 +202,7 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager):
...
@@ -199,9 +202,7 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager):
""" Start thread for processing the mail queue """
""" Start thread for processing the mail queue """
path
=
self
.
absolute_url
(
1
)
path
=
self
.
absolute_url
(
1
)
if
not
queue_threads
.
has_key
(
path
):
if
not
queue_threads
.
has_key
(
path
):
thread
=
QueueProcessorThread
()
thread
=
QueueProcessorThread
()
thread
.
setMailer
(
self
.
_makeMailer
())
thread
.
setMailer
(
self
.
_makeMailer
())
thread
.
setQueuePath
(
self
.
smtp_queue_directory
)
thread
.
setQueuePath
(
self
.
smtp_queue_directory
)
...
@@ -214,10 +215,8 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager):
...
@@ -214,10 +215,8 @@ class MailBase(Acquisition.Implicit, OFS.SimpleItem.Item, RoleManager):
""" Send the message """
""" Send the message """
if
self
.
smtp_queue
:
if
self
.
smtp_queue
:
# Start queue processor thread, if necessary
# Start queue processor thread, if necessary
self
.
_startQueueProcessorThread
()
self
.
_startQueueProcessorThread
()
delivery
=
QueuedMailDelivery
(
self
.
smtp_queue_directory
)
delivery
=
QueuedMailDelivery
(
self
.
smtp_queue_directory
)
else
:
else
:
delivery
=
DirectMailDelivery
(
self
.
_makeMailer
())
delivery
=
DirectMailDelivery
(
self
.
_makeMailer
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment