sys.setdefaultencoding("utf-8")
sys.stdout = codecs.lookup('utf-8')[-1](sys.stdout)
+
# Find the best reactor
selectWarning = "Unable to install any good reactors (kqueue, epoll, poll).\nWe fell back to using select. You may have scalability problems.\nThis reactor will not support more than 1024 connections at a time."
try:
from twisted.internet import epollreactor as bestreactor
except:
+ #try:
+ #from twisted.internet import kqreactor as bestreactor
+ #except:
try:
- from twisted.internet import kqreactor as bestreactor
+ from twisted.internet import pollreactor as bestreactor
except:
try:
- from twisted.internet import pollreactor as bestreactor
+ from twisted.internet import selectreactor as bestreactor
+ print selectWarning
except:
try:
- from twisted.internet import selectreactor as bestreactor
+ from twisted.internet import default as bestreactor
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
+twistfix.main()
# Must load config before everything else
from twisted.internet import reactor, task
from twisted.internet.defer import Deferred
-from tlib.xmlw import Element, jid, component
+from twisted.words.xish.domish import Element
+from twisted.words.protocols.jabber import component
+from twisted.words.protocols.jabber.jid import internJID
+
from debug import LogEvent, INFO, WARN, ERROR
import debug
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)
def onMessage(self, el):
fro = el.getAttribute("from")
try:
- froj = jid.intern(fro)
+ froj = internJID(fro)
except Exception, e:
LogEvent(WARN, "", "Failed stringprep.")
return
fro = el.getAttribute("from")
to = el.getAttribute("to")
try:
- froj = jid.intern(fro)
- toj = jid.intern(to)
+ froj = internJID(fro)
+ toj = internJID(to)
except Exception, e:
LogEvent(WARN, "", "Failed stringprep.")
return
# Set SIGHUP to reload the config file & close & open debug file
signal.signal(signal.SIGHUP, SIGHUPstuff)
# Load some scripts for PID and daemonising
- from twisted.scripts import twistd
+ from twisted.scripts import _twistd_unix as twistd
def main():