Changeset 5d854e1 for fedd/federation

Timestamp:

Sep 21, 2010 3:12:16 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

3bf0b3c

Parents:

87807f42

Message:

allow FEDD_URL in the environment to set the contact URL. Man am I sick of typing --url.

File:

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

fedd/federation/client_lib.py

@@ -33 +33 @@
                 type="string", help="Trusted certificates (required)")
         self.add_option("--url", action="store", dest="url",
-                type="string",default="https://localhost:23235",  
-                help="URL to connect to (default %default)")
+                type="string",default=None, help="URL to connect to")
         self.add_option("--transport", action="store", type="choice",
                 choices=("xmlrpc", "soap"), default="soap",
@@ -90 +89 @@
     and if the debug level is set, set the tracefile attribute as well.  If any
     of these tests fail, raise a RuntimeError.  Otherwise return the
-    certificate file and the dedid.
-    """
+    certificate file, the fedid, and the fedd url.
+    """
+    default_url="https://localhost:23235"
+
     if opts.debug > 0: opts.tracefile=sys.stderr
 
@@ -110 +111 @@
         raise RuntimeError("Cannot read certificate (%s)" % cert)
 
-    return (cert, fid)
+    if opts.url: url = opts.url
+    elif 'FEDD_URL' in os.environ: url = os.environ['FEDD_URL']
+    else: url = default_url
+
+
+    return (cert, fid, url)
 
 def save_certfile(out_certfile, ea):