Changeset 0a49bd7 for fedd/fedd_spewlog.py

Timestamp:

Jan 15, 2011 5:52:15 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

aaf7f41

Parents:

ac15159 (diff), 944b746 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Ted Faber <faber@…> (01/15/11 17:51:40)

git-committer:

Ted Faber <faber@…> (01/15/11 17:52:15)

Message:

merge from current

File:

• fedd/fedd_spewlog.py (modified) (4 diffs)

fedd/fedd_spewlog.py

@@ -4 +4 @@
 import time
 
+from federation.proof import proof
 from federation.remote_service import service_caller
 from federation.client_lib import client_opts, exit_with_fault, RPCException, \
@@ -12 +13 @@
         client_opts.__init__(self)
         self.add_option("--experiment_cert", dest="exp_certfile",
-                type="string", help="experiment name certificate file")
+                action='callback', callback=self.expand_file, type='str',
+                help="experiment name certificate file")
         self.add_option("--experiment_name", dest="exp_name",
                 type="string", help="human readable experiment name")
         self.add_option("--logfile", dest="logfile", default=None,
+                action='callback', callback=self.expand_file, type='str',
                 help="File to write log to")
         self.add_option('--update_time', dest='update', type='int', default=10,
@@ -25 +28 @@
 (opts, args) = parser.parse_args()
 
-cert, fid, url = wrangle_standard_options(opts)
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 if opts.exp_name and opts.exp_certfile:
@@ -58 +64 @@
                 caller=service_caller('Info'), responseBody="InfoResponseBody")
     except RPCException, e:
-        exit_with_fault(e)
+        exit_with_fault(e, 'Info (spewlog)', opts)
     except RuntimeError, e:
         sys.exit("Error processing RPC: %s" % e)
+
+    proof = proof.from_dict(resp_dict.get('proof', {}))
+    if proof and opts.auth_log:
+        log_authentication(opts.auth_log, 'Info (spewlog)', 'succeeded', proof)
 
     if not opts.serialize_only: