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 ImportError:
+except:
try:
from twisted.internet import kqreactor as bestreactor
- except ImportError:
+ except:
try:
from twisted.internet import pollreactor as bestreactor
- except ImportError:
+ except:
try:
- from twisted.internet import default as bestreactor
- print "Unable to install any good reactors (kqueue, epoll, poll)."
- print "We fell back to using select. You may have scalability problems."
- print "This reactor will not support more than 1024 connections at a time."
- except ImportError:
- print "Unable to find a reactor.\nExiting..."
- sys.exit(1)
+ from twisted.internet import selectreactor as bestreactor
+ print selectWarning
+ except:
+ try:
+ from twisted.internet import default as bestreactor
+ print selectWarning
+ except:
+ print "Unable to find a reactor.\nExiting..."
+ sys.exit(1)
bestreactor.install()
from debug import LogEvent, INFO, WARN, ERROR
import debug
+import svninfo
import utils
import xdb
import avatar
class PyTransport(component.Service):
def __init__(self):
LogEvent(INFO)
+ try:
+ LogEvent(INFO, msg="SVN r" + str(svninfo.getSVNVersion()))
+ except:
+ pass
# Discovery, as well as some builtin features
self.discovery = disco.ServerDiscovery(self)
- self.discovery.addIdentity("gateway", legacy.id, legacy.name, config.jid)
- self.discovery.addIdentity("conference", "text", legacy.name + " Chatrooms", config.jid)
+ self.discovery.addIdentity("gateway", legacy.id, config.discoName, config.jid)
+ self.discovery.addIdentity("conference", "text", config.discoName + " Chatrooms", config.jid)
self.discovery.addFeature(disco.XCONFERENCE, None, config.jid) # So that clients know you can create groupchat rooms on the server
self.discovery.addFeature("jabber:iq:conference", None, config.jid) # We don't actually support this, but Psi has a bug where it looks for this instead of the above
self.discovery.addIdentity("client", "pc", "MSN Messenger", "USER")
# Message IDs
self.messageID = 0
- self.loopCall = task.LoopingCall(self.loopCall)
- self.loopCall.start(60.0)
+ self.loopTask = task.LoopingCall(self.loopFunc)
+ self.loopTask.start(60.0)
def removeMe(self):
LogEvent(INFO)
def reserveID(self, ID):
self.reservedIDs.append(ID)
- def loopCall(self):
+ def loopFunc(self):
numsessions = len(self.sessions)
#if config.debugOn and numsessions > 0:
mtype = el.getAttribute("type")
s = self.sessions.get(froj.userhost(), None)
if mtype == "error" and s:
+ LogEvent(INFO, s.jabberID, "Removing session because of message type=error")
s.removeMe()
elif s:
s.onMessage(el)
- else:
+ elif mtype != "error":
to = el.getAttribute("to")
ulang = utils.getLang(el)
body = None
LogEvent(WARN, "", "Failed stringprep.")
return
+ ptype = el.getAttribute("type")
s = self.sessions.get(froj.userhost())
- if s:
+ if ptype == "error" and s:
+ LogEvent(INFO, s.jabberID, "Removing session because of message type=error")
+ s.removeMe()
+ elif s:
s.onPresence(el)
else:
ulang = utils.getLang(el)