Add options generator I forgot to add...

[irc/quakenet/qwebirc.git] / qwebirc / root.py

diff --git a/qwebirc/root.py b/qwebirc/root.py
index 20fd66f45769acf90ecdb38effccbf2a30da6e28..b6f26e362242505e0e7a81f8a62665c128c81534 100644 (file)
--- a/qwebirc/root.py
+++ b/qwebirc/root.py
@@ -1,8 +1,8 @@
-from ajaxengine import AJAXEngine
-from authgateengine import AuthgateEngine
-from feedbackengine import FeedbackEngine
+from twisted.web import resource, server, static, http
+from twisted.internet import error, reactor
+import engines
 import mimetypes
-from twisted.web import resource, server, static
+import config
 
 class RootResource(resource.Resource):
   def getChild(self, name, request):
@@ -10,15 +10,49 @@ class RootResource(resource.Resource):
       name = "qui.html"
     return self.primaryChild.getChild(name, request)
 
+# we do NOT use the built-in timeOut mixin as it's very very buggy!
+class TimeoutHTTPChannel(http.HTTPChannel):
+  timeout = config.HTTP_REQUEST_TIMEOUT
+
+  def connectionMade(self):
+    self.customTimeout = reactor.callLater(self.timeout, self.timeoutOccured)
+    http.HTTPChannel.connectionMade(self)
+    
+  def timeoutOccured(self):
+    self.customTimeout = None
+    self.transport.loseConnection()
+    
+  def cancelTimeout(self):
+    if self.customTimeout is not None:
+      try:
+        self.customTimeout.cancel()
+        self.customTimeout = None
+      except error.AlreadyCalled:
+        pass
+
+  def connectionLost(self, reason):
+    self.cancelTimeout()
+    http.HTTPChannel.connectionLost(self, reason)
+
 class RootSite(server.Site):
+  # we do this ourselves as the built in timeout stuff is really really buggy
+  protocol = TimeoutHTTPChannel
+  
   def __init__(self, path, *args, **kwargs):
     root = RootResource()
     server.Site.__init__(self, root, *args, **kwargs)
 
-    root.primaryChild = static.File(path)
-    root.putChild("e", AJAXEngine("/e"))
-    root.putChild("feedback", FeedbackEngine("/feedback"))
-    root.putChild("auth", AuthgateEngine("/auth"))
+    services = {}
+    services["StaticEngine"] = root.primaryChild = engines.StaticEngine(path)
 
+    def register(service, path, *args, **kwargs):
+      sobj = service("/" + path, *args, **kwargs)
+      services[service.__name__] = sobj
+      root.putChild(path, sobj)
+      
+    register(engines.AJAXEngine, "e")
+    register(engines.FeedbackEngine, "feedback")
+    register(engines.AuthgateEngine, "auth")
+    register(engines.AdminEngine, "adminengine", services)
+    
 mimetypes.types_map[".ico"] = "image/vnd.microsoft.icon"
-