Changeset a2da110

Timestamp:

Nov 28, 2008 2:54:22 PM (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:

1b57352

Parents:

0ea5050

Message:

Move service configuration into the config file and remove some extraneous options.

File:

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

fedd/fedd.py

@@ -3 +3 @@
 import sys
 
+from socket import error as socket_error
 from BaseHTTPServer import BaseHTTPRequestHandler
 
@@ -268 +269 @@
                 version="0.1")
 
-        self.set_defaults(host="localhost", port=23235, transport="soap",
-                logfile=None, debug=0)
+        self.set_defaults(logfile=None, debug=0)
 
         self.add_option("-d", "--debug", action="count", dest="debug", 
                 help="Set debug.  Repeat for more information")
         self.add_option("-f", "--configfile", action="store",
+                default="/usr/local/etc/fedd.conf",
                 dest="configfile", help="Configuration file (required)")
-        self.add_option("-H", "--host", action="store", type="string",
-                dest="host", help="Hostname to listen on (default %default)")
         self.add_option("-l", "--logfile", action="store", dest="logfile", 
                 help="File to send log messages to")
-        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"),
-                help="Transport for request (xmlrpc|soap) (Default: %default)")
         self.add_option("--trace", action="store_const", dest="tracefile", 
                 const=sys.stderr, help="Print SOAP exchange to stderr")
 
 servers_active = True       # Sub-servers run while this is True
-services = [ ]              # Service descriptions
 servers = [ ]               # fedd_server instances instantiated from services
 servers_lock = Lock()       # Lock to manipulate servers from sub-server threads
@@ -385 +375 @@
             raise
 
-# Walk through the service descriptions and pack them into the services list.
-# That list has the form (transport (host, port)).
-if opts.services:
-    for s in opts.services:
-        try:
-            h, p, t  = s.split(':')
-        except ValueError:
-            sys.exit("Invalid services specification: %s" % s)
-
-        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:
-    services.append((opts.transport, (opts.host, opts.port)))
-
-# Create the servers and put them into a list
-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: flog.warning("Unknown transport: %s" % s[0])
+services = config.get("globals", "services", "23235")
+
+for s in services.split(","):
+    s = s.strip()
+    colons = s.count(":")
+    try:
+        if colons == 0:
+            p = int(s)
+            h = ''
+            t = 'soap'
+        elif colons == 1:
+            p, t  = s.split(":")
+            p = int(p)
+            h = ''
+        elif colons == 2:
+            h, p, t  = s.split(":")
+            p = int(p)
+        else:
+            flog.error("Invalid service specification %s ignored." % s)
+            continue
+    except ValueError:
+        flog.error("Error converting port to integer in %s: spec ignored" % s)
+        continue
+
+    t = t.lower()
+    try:
+        if t == 'soap':
+            servers.append(fedd_server((h, p), fedd_soap_handler, ctx, impl))
+        elif t == 'xmlrpc':
+            servers.append(fedd_server((h, p), fedd_xmlrpc_handler, ctx, impl))
+        else:
+            flog.error("Invalid transport specification (%s) in service %s" % \
+                    (t, s))
+            continue
+    except socket_error, e:
+        flog.error("Cannot create server for %s: %s" % (s, e[1]))
+        continue
 
 #  Make sure that there are no malformed servers in the list
-services = [ s for s in services if s ]
+servers = [ s for s in servers if s ]
 
 # Catch signals