tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only-write-once-to-cur-or-new.patch

Browse Source 
I have tested this and Dovecot no longer beats offlineimap
to the punch. (-:

I achieved that by keeping the renames in tmp/ until it finally does
one last rename in new/ or cur/.
This commit is contained in:
Asheesh Laroia 2007-06-13 04:42:15 +01:00
parent 799c867a4d
commit 35e7250187
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
offlineimap/folder/Maildir.py
View File

@ -130,6 +130,8 @@ class MaildirFolder(BaseFolder):
return st.st_mtime return st.st_mtime
def savemessage(self, uid, content, flags, rtime): def savemessage(self, uid, content, flags, rtime):
# This function only ever saves to tmp/,
# but it calls savemessageflags() to actually save to cur/ or new/.
ui = UIBase.getglobalui() ui = UIBase.getglobalui()
ui.debug('maildir', 'savemessage: called to write with flags %s and content %s' % \ ui.debug('maildir', 'savemessage: called to write with flags %s and content %s' % \
(repr(flags), repr(content))) (repr(flags), repr(content)))
@ -140,12 +142,9 @@ class MaildirFolder(BaseFolder):
# We already have it. # We already have it.
self.savemessageflags(uid, flags) self.savemessageflags(uid, flags)
return uid return uid
if 'S' in flags:
# If a message has been seen, it goes into the cur # Otherwise, save the message in tmp/ and then call savemessageflags()
# directory. CR debian#152482, [complete.org #4] # to give it a permanent home.
newdir = os.path.join(self.getfullname(), 'cur')
else:
newdir = os.path.join(self.getfullname(), 'new')
tmpdir = os.path.join(self.getfullname(), 'tmp') tmpdir = os.path.join(self.getfullname(), 'tmp')
messagename = None messagename = None
attempts = 0 attempts = 0
@ -179,20 +178,21 @@ class MaildirFolder(BaseFolder):
os.utime(os.path.join(tmpdir,tmpmessagename), (rtime,rtime)) os.utime(os.path.join(tmpdir,tmpmessagename), (rtime,rtime))
ui.debug('maildir', 'savemessage: moving from %s to %s' % \ ui.debug('maildir', 'savemessage: moving from %s to %s' % \
(tmpmessagename, messagename)) (tmpmessagename, messagename))
os.link(os.path.join(tmpdir, tmpmessagename), if tmpmessagename != messagename: # then rename it
os.path.join(newdir, messagename)) os.link(os.path.join(tmpdir, tmpmessagename),
os.unlink(os.path.join(tmpdir, tmpmessagename)) os.path.join(tmpdir, messagename))
os.unlink(os.path.join(tmpdir, tmpmessagename))
try: try:
# fsync the directory (safer semantics in Linux) # fsync the directory (safer semantics in Linux)
fd = os.open(newdir, os.O_RDONLY) fd = os.open(tmpdir, os.O_RDONLY)
os.fsync(fd) os.fsync(fd)
os.close(fd) os.close(fd)
except: except:
pass pass
self.messagelist[uid] = {'uid': uid, 'flags': [], self.messagelist[uid] = {'uid': uid, 'flags': [],
'filename': os.path.join(newdir, messagename)} 'filename': os.path.join(tmpdir, messagename)}
self.savemessageflags(uid, flags) self.savemessageflags(uid, flags)
ui.debug('maildir', 'savemessage: returning uid %d' % uid) ui.debug('maildir', 'savemessage: returning uid %d' % uid)
return uid return uid
@ -203,6 +203,7 @@ class MaildirFolder(BaseFolder):
def savemessageflags(self, uid, flags): def savemessageflags(self, uid, flags):
oldfilename = self.messagelist[uid]['filename'] oldfilename = self.messagelist[uid]['filename']
newpath, newname = os.path.split(oldfilename) newpath, newname = os.path.split(oldfilename)
tmpdir = os.path.join(self.getfullname(), 'tmp')
if 'S' in flags: if 'S' in flags:
# If a message has been seen, it goes into the cur # If a message has been seen, it goes into the cur
# directory. CR debian#152482, [complete.org #4] # directory. CR debian#152482, [complete.org #4]
@ -225,6 +226,10 @@ class MaildirFolder(BaseFolder):
self.messagelist[uid]['flags'] = flags self.messagelist[uid]['flags'] = flags
self.messagelist[uid]['filename'] = newfilename self.messagelist[uid]['filename'] = newfilename
# By now, the message had better not be in tmp/ land!
final_dir, final_name = os.path.split(self.messagelist[uid]['filename'])
assert final_dir != tmpdir
def deletemessage(self, uid): def deletemessage(self, uid):
if not uid in self.messagelist: if not uid in self.messagelist:
return return