Changeset 293

Timestamp:

06/23/08 00:38:27 (2 months ago)

Author:

heyadayo

Message:

configuration for dispatch protocol added

Location:

branches/0.5/daemon/orbited

Files:

• config.py (modified) (1 diff)
• dispatch.py (modified) (3 diffs)
• start.py (modified) (1 diff)

branches/0.5/daemon/orbited/config.py

@@ -24 +24 @@
 
 defaults = {
+    '[global]': {
+        'dispatch.enabled': '1',
+        'dispatch.port': '9000'
+    },
     '[access]': [
         ('localhost', 9998), # Allow WebSocket test daemon

branches/0.5/daemon/orbited/dispatch.py

@@ -2 +2 @@
 from twisted.internet.protocol import Protocol, Factory
 from twisted.internet import reactor
+from config import map as config
+from logger import get_logger
 
-
+logger = get_logger('Dispatch')
 
 class DispatchConnection(TCPConnection):
@@ -36 +38 @@
 
     def __init__(self, *args, **kwargs):
-      TCPConnectionFactory.__init__(self, *args, **kwargs)
-      self.dispatch_connections = {}
-      self.factory = DispatchProtocolFactory(self)
-      reactor.listenTCP(9000, self.factory)
+        TCPConnectionFactory.__init__(self, *args, **kwargs)
+        self.dispatch_connections = {}
+        self.factory = DispatchProtocolFactory(self)
+        port = int(config['[global]']['dispatch.port'])
+        logger.info('Listening Orbit@%s (legacy dispatch protocol)' % port)
+        reactor.listenTCP(port, self.factory)
       
     def receive_frame(self, conn, headers, body):
@@ -70 +74 @@
         self.root = root
         self.protocol = DispatchProtocol
+        
     def buildProtocol(self, addr):
+        logger.access('Dispatch [ %s ] ' % (addr,))
         return DispatchProtocol(self.root.receive_frame)
     

branches/0.5/daemon/orbited/start.py

@@ -24 +24 @@
     root.putChild('binaryproxy', BinaryProxyFactory())
     root.putChild('websocket', WebSocketFactory())
-    root.putChild('legacy', DispatchFactory())
+    if config['[global]']['dispatch.enabled'] == '1':
+        root.putChild('legacy', DispatchFactory())
+        
     for addr in config['[listen]']:
         url = urlparse.urlparse(addr)