Skip to content

Commit 4212d5e

Browse files
committed
update
1 parent add5d8a commit 4212d5e

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

Mailman/Queue/Switchboard.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ def dequeue(self, filebase):
356356
else:
357357
try:
358358
os.rename(backfile, filename)
359-
except OSError as e:
359+
except Exception as e:
360360
mailman_log('error', 'Failed to rename backup file %s (full paths: %s -> %s): %s\nTraceback:\n%s',
361361
filebase, os.path.join(self.__whichq, filebase + '.bak'), os.path.join(self.__whichq, filebase + '.pck'), str(e), traceback.format_exc())
362362
self.finish(filebase, preserve=True)
@@ -372,13 +372,14 @@ def dequeue(self, filebase):
372372
return None, None
373373

374374
# Move to backup file
375+
mailman_log('debug', 'Switchboard.dequeue: About to rename %s to %s', filename, backfile)
375376
try:
376377
os.rename(filename, backfile)
377378
mailman_log('debug', 'Switchboard.dequeue: Successfully moved %s to %s', filename, backfile)
378-
except OSError as e:
379-
mailman_log('error', 'Switchboard.dequeue: Error moving %s to %s: %s', filename, backfile, str(e))
379+
except Exception as e:
380+
mailman_log('error', 'Switchboard.dequeue: Exception during os.rename from %s to %s: %s\nTraceback:\n%s', filename, backfile, str(e), traceback.format_exc())
380381
return None, None
381-
382+
382383
# Validate data structure before returning
383384
if not isinstance(data, dict):
384385
mailman_log('error', 'Switchboard.dequeue: Invalid data structure in %s: expected dict, got %s', filename, type(data))
@@ -669,7 +670,7 @@ def recover_backup_files(self):
669670
else:
670671
try:
671672
os.rename(src, dst)
672-
except OSError as e:
673+
except Exception as e:
673674
mailman_log('error', 'Failed to rename backup file %s (full paths: %s -> %s): %s\nTraceback:\n%s',
674675
filebase, os.path.join(self.__whichq, filebase + '.bak'), os.path.join(self.__whichq, filebase + '.pck'), str(e), traceback.format_exc())
675676
self.finish(filebase, preserve=True)

0 commit comments

Comments
 (0)