Changeset 8cab4c2 for fedd/federation/experiment_control.py

Timestamp:

Mar 4, 2012 6:45:19 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

6527d60

Parents:

2bb8b35

Message:

More improved logging

File:

• fedd/federation/experiment_control.py (modified) (10 diffs)

fedd/federation/experiment_control.py

@@ -1661 +1661 @@
             self.auth.save()
 
-        access_ok, proof = self.auth.check_attribute(fid, 'new', 
-                with_proof=True)
+        try:
+            access_ok, proof = self.auth.check_attribute(fid, 'new', 
+                    with_proof=True)
+        except service_error, e:
+            self.log.info("New experiment call for %s: access denied" % fid)
+            raise e
+
 
         if not access_ok:
@@ -1998 +2003 @@
             raise service_error(service_error.req, "No request?")
 
-        proof = self.check_experiment_access(fid, key)
+        try:
+            proof = self.check_experiment_access(fid, key)
+        except service_error, e:
+            self.log.info("vtopo call failed for %s: access denied" %  fid)
+            raise e
 
         self.state_lock.acquire()
@@ -2053 +2062 @@
             raise service_error(service_error.req, "No request?")
 
-        proof = self.check_experiment_access(fid, key)
+        try:
+            proof = self.check_experiment_access(fid, key)
+        except service_error, e:
+            self.log.info("vis call failed for %s: access denied" %  fid)
+            raise e
 
         self.state_lock.acquire()
@@ -2155 +2168 @@
             self.auth.save()
 
-        # Make sure that the caller can talk to us
-        proof = self.check_experiment_access(fid, key)
+        try:
+            # Make sure that the caller can talk to us
+            proof = self.check_experiment_access(fid, key)
+        except service_error, e:
+            self.log.info("Create experiment call failed for %s: access denied"\
+                    % fid)
+            raise e
+
 
         # Install the testbed map entries supplied with the request into a copy
@@ -2398 +2417 @@
             raise service_error(service_error.req, "No request?")
 
-        proof = self.check_experiment_access(fid, key)
+        try:
+            proof = self.check_experiment_access(fid, key)
+        except service_error, e:
+            self.log.info("Info call failed for %s: access denied" %  fid)
+
 
         self.update_info(key, fresh)
@@ -2498 +2521 @@
             else: return None
 
+        self.log.info("Operation call started for %s" %  fid)
         req = req.get('OperationRequestBody', None)
         if not req:
@@ -2522 +2546 @@
             raise service_error(service_error.req, "No request?")
 
-        proof = self.check_experiment_access(fid, key)
+        try:
+            proof = self.check_experiment_access(fid, key)
+        except service_error, e:
+            self.log.info("Operation call failed for %s: access denied" %  fid)
+            raise e
+
         self.state_lock.acquire()
         if key in self.state:
@@ -2534 +2563 @@
 
         if top is None:
+            self.log.info("Operation call failed for %s: not active" %  fid)
             raise service_error(service_error.partial, "No topology yet", 
                     proof=proof)
@@ -2558 +2588 @@
                 results)
 
+        self.log.info("Operation call succeeded for %s" %  fid)
         return { 
                 'experiment': exp, 
@@ -2720 +2751 @@
 
         key = self.get_experiment_key(req, 'experiment')
-        proof = self.check_experiment_access(fid, key)
+        try:
+            proof = self.check_experiment_access(fid, key)
+        except service_error, e:
+            self.log.info(
+                    "Terminate experiment call failed for %s: access denied" \
+                            % fid)
+            raise e
         exp = req.get('experiment', False)
         force = req.get('force', False)