Changeset 46e4682 for fedd/fedd_client.py

Timestamp:

Jul 28, 2009 10:57:38 AM (15 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:

d15522f

Parents:

3c20a31

Message:

termination logs, a terminating state, and avoiding a deadlock

File:

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

fedd/fedd_client.py

@@ -163 +163 @@
                 action="store_true", default=False,
                 help="Force termination if experiment is in strange state")
+        self.add_option("--logfile", dest="logfile", default=None,
+                help="File to write log to")
+        self.add_option("--print_log", dest="print_log", default=False,
+                action="store_true",
+                help="Print deallocation log to standard output")
 
 class fedd_multi_exp_data_opts(fedd_client_opts):
@@ -1054 +1059 @@
         if opts.exp_name and opts.exp_certfile:
             sys.exit("Only one of --experiment_cert and " +\
-                    "--experiment_name permitted");
+                    "--experiment_name permitted")
+
+        if opts.print_log and opts.logfile:
+            sys.exit("Only one of --logfile and --print_log is permitted")
+        elif opts.print_log:
+            out = sys.stdout
+        elif opts.logfile:
+            try:
+                out = open(opts.logfile, "w")
+            except IOError,e:
+                sys.exit("Cannot open logfile: %s" %e)
+        else:
+            out = None
 
         exp_id = None
@@ -1082 +1099 @@
             sys.exit("Error processing RPC: %s" % e)
 
-        eid = resp_dict.get('experimentID', None)
-        if eid:
-            for id in eid:
-                for k in id.keys():
-                    if k == 'fedid': print "%s: %s" % (k,fedid(bits=id[k]))
-                    else: print "%s: %s" % (k, id[k])
+        if out:
+            log = resp_dict.get('deallocationLog', None)
+            if log:
+                print >>out, log
+                out.close()
+            else:
+                out.close()
+                sys.exit("No log returned")
 
 class create(fedd_rpc):