Changeset 26 for rc/puzzlebox_brainstorms_server.py

Timestamp:

02/03/10 23:05:48 (12 years ago)

Author:

sc

Message:

server:

• now listening on all server's interfaces

configuration:

• now listening on all server's interfaces

client:

• support for Python Twisted/Pygame? event loop integration

client_interface:

• support for Python Twisted/Pygame? event loop integration

File:

• rc/puzzlebox_brainstorms_server.py (modified) (5 diffs)

rc/puzzlebox_brainstorms_server.py

@@ -11 +11 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.htm
 #
-# Last Update: 2010.02.02
+# Last Update: 2010.02.03
 #
 #####################################################################
@@ -30 +30 @@
 DEBUG = 1
 
-SERVER_HOST = configuration.SERVER_HOST
+SERVER_INTERFACE = configuration.SERVER_INTERFACE
 SERVER_PORT = configuration.SERVER_PORT
 
@@ -41 +41 @@
         def __init__(self, log, DEBUG=DEBUG):
                 
-                self.protocol = puzzlebox_brainstorms_server_protocol
-                
                 self.log = log
                 self.DEBUG = DEBUG
                 
-                self.registry = {}
+                self.protocol = puzzlebox_brainstorms_server_protocol
         
         
@@ -58 +56 @@
                 
                 if self.DEBUG:
-                        print '--> [Server] %s command received' % command
+                        print '--> [Server] %s' % response
                 
-                command = 'python puzzlebox_brainstorms_rc.py --command=%s' % command
-                os.system(command)
+                
+                command_line = 'python puzzlebox_brainstorms_rc.py --command=%s' % command
+                
+                os.system(command_line)
                 
                 
@@ -150 +150 @@
         
         # Collect default settings and command line parameters
-        server_host = SERVER_HOST
+        server_interface = SERVER_INTERFACE
         server_port = SERVER_PORT
         
         for each in sys.argv:
                 
-                if each.startswith("--host="):
-                        server_host = each[ len("--host="): ]
+                if each.startswith("--interface="):
+                        server_interface = each[ len("--interface="): ]
                 if each.startswith("--port="):
                         server_port = each[ len("--port="): ]
         
         
-        mcp = puzzlebox_brainstorms_server(log, DEBUG)
-        reactor.listenTCP(port=server_port, factory=mcp, interface=server_host)
+        server = puzzlebox_brainstorms_server(log, DEBUG=DEBUG)
+        
+        if DEBUG:
+                print "--> [Server] Initializing server on %s:%i" % \
+                        (server_interface, server_port)
+        
+        reactor.listenTCP(interface=server_interface, port=server_port, factory=server)
+        
         reactor.run()