Major changes. Moved everything away from twistd and .tac files. Its nicer this way...

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@102 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/main.py b/src/main.py
index ddfbb200a622fe91befcc1f5319a23b07581de15..e89b3d62bb877be9a6ef744151511135c2ea8e5e 100644 (file)
--- a/src/main.py
+++ b/src/main.py
@@ -297,11 +297,11 @@ class App:
                                        pf.close()
                                        try:
                                                os.kill(pid, signal.SIGHUP)
-                                               alreadyRunning()
+                                               self.alreadyRunning()
                                        except OSError:
                                                pass
                                else:
-                                       alreadyRunning()
+                                       self.alreadyRunning()
        
                        # Create a PID file
                        pid = str(os.getpid())
@@ -350,16 +350,16 @@ def main():
                        sys.stderr.write("Daemonise failed: (%d) %s\n" % (e.errno, e.strerror))
                        sys.exit(1)
 
-       # Initialise debugging, and do the other half of SIGHUPstuff
-       debug.reloadConfig()
-       legacy.reloadConfig()
-
        # Do any auto-update stuff
        housekeep.init()
 
        # Create the application
        app = App()
 
+       # Initialise debugging, and do the other half of SIGHUPstuff
+       debug.reloadConfig()
+       legacy.reloadConfig()
+
        reactor.run()
 
 if __name__ == "__main__":