diff options
| author | Barry Warsaw | 2008-03-12 21:54:27 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2008-03-12 21:54:27 -0400 |
| commit | b091b286812b2c2c380454eeee914f77a5c35def (patch) | |
| tree | 883fb3023918ab111544bd9db75e51a127de0b2c /mailman/queue | |
| parent | 33dd95e8a8ebc17b5892f5c45e557a2d027e956d (diff) | |
| parent | 2b5060ef4d43a279d084e0fd7e3f98a38e154259 (diff) | |
| download | mailman-b091b286812b2c2c380454eeee914f77a5c35def.tar.gz mailman-b091b286812b2c2c380454eeee914f77a5c35def.tar.zst mailman-b091b286812b2c2c380454eeee914f77a5c35def.zip | |
merge down thread
Diffstat (limited to 'mailman/queue')
| -rw-r--r-- | mailman/queue/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mailman/queue/__init__.py b/mailman/queue/__init__.py index fb6b07479..e30608138 100644 --- a/mailman/queue/__init__.py +++ b/mailman/queue/__init__.py @@ -274,6 +274,7 @@ class Runner: log.error('Skipping and preserving unparseable message: %s', filebase) self._switchboard.finish(filebase, preserve=True) + config.db.abort() continue try: self._onefile(msg, msgdata) @@ -303,11 +304,13 @@ class Runner: log.error('SHUNTING FAILED, preserving original entry: %s', filebase) self._switchboard.finish(filebase, preserve=True) - # Other work we want to do each time through the loop + config.db.abort() + # Other work we want to do each time through the loop. Utils.reap(self._kids, once=True) self._doperiodic() if self._shortcircuit(): break + config.db.commit() return len(files) def _onefile(self, msg, msgdata): |