Changeset a97394b for fedd/fedd.py

Timestamp:

Oct 7, 2008 11:03:50 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

8ecfbad

Parents:

eee2b2e

Message:

beginnings of a real multithreaded server

File:

• fedd/fedd.py (modified) (5 diffs)

fedd/fedd.py

@@ -17 +17 @@
 from fedd_deter_impl import new_feddservice
 from service_error import *
+
+from threading import *
 
 # The SSL server here is based on the implementation described at
@@ -166 +168 @@
                 version="0.1")
 
-        self.set_defaults(host="localhost", port=23235, 
-                transport="soap",debug=0)
+        self.set_defaults(host="localhost", port=23235, transport="soap",
+                debug=0)
 
         self.add_option("-d", "--debug", action="count", dest="debug", 
@@ -177 +179 @@
         self.add_option("-p", "--port", action="store", type="int",
                 dest="port", help="Port to listen on (default %default)")
+        self.add_option("-s", "--service", action="append", type="string",
+                dest="services",
+                help="Service description: host:port:transport")
         self.add_option("-x","--transport", action="store", type="choice",
                 choices=("xmlrpc", "soap"),
@@ -182 +187 @@
         self.add_option("--trace", action="store_const", dest="tracefile", 
                 const=sys.stderr, help="Print SOAP exchange to stderr")
+
+def run_server(s):
+    if s: s.serve_forever()
+
+services = [ ]
+servers = [ ]
 
 opts, args = fedd_opts().parse_args()
@@ -209 +220 @@
             raise
 
-if opts.transport == "soap":
-    s = fedd_server(SOAP_port, fedd_soap_handler, ctx, impl)
-elif opts.transport == "xmlrpc":
-    s = fedd_server(SOAP_port, fedd_xmlrpc_handler, ctx, impl)
+if opts.services:
+    for s in opts.services:
+        h, p, t  = s.split(':')
+
+        if not h: h = opts.host
+        if not p: p = opts.port
+        if not t: h = opts.transport
+
+        p = int(p)
+
+        services.append((t, (h, p)))
 else:
-    s = None
-
-s.serve_forever()
+    services.append((opts.transport, (opts.host, opts.port)))
+
+for s in services:
+    if s[0] == "soap":
+        servers.append(fedd_server(s[1], fedd_soap_handler, ctx, impl))
+    elif s[0] == "xmlrpc":
+        servers.append(fedd_server(s[1], fedd_xmlrpc_handler, ctx, impl))
+    else: print >>sys.stderr, "Unknown transport: %s" % s[0]
+
+for s in servers:
+    t = Thread(target=run_server, args=(s,))
+    t.start()