From 8491fdbe09ad7928f0e52d7a348138880de96ebf Mon Sep 17 00:00:00 2001 From: Patrick Ulbrich Date: Wed, 4 Jan 2012 20:14:31 +0100 Subject: [PATCH] cleaner usage of global vars in mailnag.py --- Mailnag/mailnag.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Mailnag/mailnag.py b/Mailnag/mailnag.py index 9d43df3..30fa02a 100644 --- a/Mailnag/mailnag.py +++ b/Mailnag/mailnag.py @@ -34,6 +34,11 @@ from common.accountlist import AccountList from daemon.mailchecker import MailChecker from daemon.idlers import Idlers +mainloop = None +mailchecker = None +idlers = None + + def read_config(): if not cfg_exists(): return None @@ -56,13 +61,11 @@ def delete_pid(): # delete file mailnag.pid def cleanup(): # clean up resources - try: + if mailchecker != None: mailchecker.dispose() - except NameError: pass - - try: + + if idlers != None: idlers.dispose() - except NameError: pass delete_pid() @@ -73,9 +76,7 @@ def sig_handler(signum, frame): def main(): - global mailchecker, mainloop, idlers - - mainloop = None + global mainloop, mailchecker, idlers set_procname("mailnag")