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

Implement true single-threading

Browse Source 
Previously, we would spawn child threads for account synchronization
even if we had single-threading enabled. This prevented us from catching
the true location of exceptions, for example. Now, in single-threaded
mode, we perform the account synchronization truely in the main thread
which will ease our debugging.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Sebastian Spaeth 2011-01-12 11:15:12 +01:00 committed by Nicolas Sebrecht
parent 760698253b
commit b81b7d6001
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
offlineimap/init.py
View File

@ -293,11 +293,8 @@ class OfflineImap:
remoterepos = None remoterepos = None
localrepos = None localrepos = None
if options.singlethreading: threadutil.initInstanceLimit("ACCOUNTLIMIT",
threadutil.initInstanceLimit("ACCOUNTLIMIT", 1) config.getdefaultint("general", "maxsyncaccounts", 1))
else:
threadutil.initInstanceLimit("ACCOUNTLIMIT",
config.getdefaultint("general", "maxsyncaccounts", 1))
for reposname in config.getsectionlist('Repository'): for reposname in config.getsectionlist('Repository'):
for instancename in ["FOLDER_" + reposname, for instancename in ["FOLDER_" + reposname,
@ -326,15 +323,23 @@ class OfflineImap:
signal.signal(signal.SIGUSR1,sig_handler) signal.signal(signal.SIGUSR1,sig_handler)
signal.signal(signal.SIGUSR2,sig_handler) signal.signal(signal.SIGUSR2,sig_handler)
threadutil.initexitnotify() #various initializations that need to be performed:
t = threadutil.ExitNotifyThread(target=syncmaster.syncitall, threadutil.initexitnotify() #TODO: Why?
offlineimap.mbnames.init(config, syncaccounts)
if options.singlethreading:
#singlethreaded
self.sync_singlethreaded(syncaccounts, config, siglisteners)
else:
# multithreaded
t = threadutil.ExitNotifyThread(target=syncmaster.syncitall,
name='Sync Runner', name='Sync Runner',
kwargs = {'accounts': syncaccounts, kwargs = {'accounts': syncaccounts,
'config': config, 'config': config,
'siglisteners': siglisteners}) 'siglisteners': siglisteners})
t.setDaemon(1) t.setDaemon(1)
t.start() t.start()
threadutil.exitnotifymonitorloop(threadutil.threadexited) threadutil.exitnotifymonitorloop(threadutil.threadexited)
except KeyboardInterrupt: except KeyboardInterrupt:
ui.terminate(1, errormsg = 'CTRL-C pressed, aborting...') ui.terminate(1, errormsg = 'CTRL-C pressed, aborting...')
@ -344,4 +349,16 @@ class OfflineImap:
except: except:
ui.mainException() ui.mainException()
def sync_singlethreaded(self, accs, config, siglisteners):
"""Executed if we do not want a separate syncmaster thread
:param accs: A list of accounts that should be synced
:param config: The CustomConfig object
:param siglisteners: The signal listeners list, defined in run()
"""
for accountname in accs:
account = offlineimap.accounts.SyncableAccount(config, accountname)
siglistener = offlineimap.accounts.SigListener()
siglisteners.append(siglistener)
threading.currentThread().name = "Account sync %s" % accountname
account.syncrunner(siglistener=siglistener)

4
offlineimap/syncmaster.py
View File

@ -16,7 +16,6 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
from offlineimap import mbnames
from offlineimap.threadutil import threadlist, InstanceLimitedThread, ExitNotifyThread from offlineimap.threadutil import threadlist, InstanceLimitedThread, ExitNotifyThread
from offlineimap.accounts import SyncableAccount, SigListener from offlineimap.accounts import SyncableAccount, SigListener
from threading import currentThread from threading import currentThread
@ -33,11 +32,10 @@ def syncaccount(threads, config, accountname, siglisteners):
thread.setDaemon(1) thread.setDaemon(1)
thread.start() thread.start()
threads.add(thread) threads.add(thread)
def syncitall(accounts, config, siglisteners): def syncitall(accounts, config, siglisteners):
currentThread().setExitMessage('SYNC_WITH_TIMER_TERMINATE') currentThread().setExitMessage('SYNC_WITH_TIMER_TERMINATE')
threads = threadlist() threads = threadlist()
mbnames.init(config, accounts)
for accountname in accounts: for accountname in accounts:
syncaccount(threads, config, accountname, siglisteners) syncaccount(threads, config, accountname, siglisteners)
# Wait for the threads to finish. # Wait for the threads to finish.