* Log the reactor upon startup

 * Removed kqueue reactor from list of auto reactors

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

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

diff --git a/src/main.py b/src/main.py
index 305d549b18f254210134ce7d477a17ea743237e6..e34f95a31c54b4b6ff0050dba35c8e03b3865eef 100644 (file)
--- a/src/main.py
+++ b/src/main.py
@@ -12,22 +12,22 @@ selectWarning = "Unable to install any good reactors (kqueue, epoll, poll).\nWe
 try:
        from twisted.internet import epollreactor as bestreactor
 except:
 try:
        from twisted.internet import epollreactor as bestreactor
 except:

+       #try:
+               #from twisted.internet import kqreactor as bestreactor
+       #except:

        try:
        try:

-               from twisted.internet import kqreactor as bestreactor
+               from twisted.internet import pollreactor as bestreactor

        except:
                try:
        except:
                try:

-                       from twisted.internet import pollreactor as bestreactor
+                       from twisted.internet import selectreactor as bestreactor
+                       print selectWarning

                except:
                        try:
                except:
                        try:

-                               from twisted.internet import selectreactor as bestreactor
+                               from twisted.internet import default as bestreactor

                                print selectWarning
                        except:
                                print selectWarning
                        except:

-                               try:
-                                       from twisted.internet import default as bestreactor
-                                       print selectWarning
-                               except:
-                                       print "Unable to find a reactor. Please make sure you have Twisted properly installed.\nExiting..."
-                                       sys.exit(1)
+                               print "Unable to find a reactor. Please make sure you have Twisted properly installed.\nExiting..."
+                               sys.exit(1)

 bestreactor.install()
 
 import twistfix
 bestreactor.install()
 
 import twistfix


@@ -125,6 +125,7 @@ class PyTransport(component.Service):
                        LogEvent(INFO, msg="SVN r" + str(svninfo.getSVNVersion()))
                except:
                        pass
                        LogEvent(INFO, msg="SVN r" + str(svninfo.getSVNVersion()))
                except:
                        pass

+               LogEvent(INFO, msg="Reactor: " + str(reactor))

 
                # Discovery, as well as some builtin features
                self.discovery = disco.ServerDiscovery(self)
 
                # Discovery, as well as some builtin features
                self.discovery = disco.ServerDiscovery(self)