avoid as much as possible accessing logger through class instances, whenever that...

[sfa.git] / sfa / methods / Renew.py

diff --git a/sfa/methods/Renew.py b/sfa/methods/Renew.py
index e3ae1c3..3cbb929 100644 (file)
--- a/sfa/methods/Renew.py
+++ b/sfa/methods/Renew.py
@@ -4,6 +4,7 @@ from sfa.util.faults import InsufficientRights
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.sfatime import utcparse, add_datetime
+from sfa.util.sfalogging import logger
 
 from sfa.trust.credential import Credential
 
@@ -12,7 +13,7 @@ from sfa.storage.parameter import Parameter
 
 class Renew(Method):
     """
-    Renews the resources in the specified slice or slivers by 
+    Renews the resources in the specified slice or slivers by
     extending the lifetime.
 
     @param urns ([string]) List of URNs of to renew
@@ -32,13 +33,14 @@ class Renew(Method):
     def call(self, urns, creds, expiration_time, options):
 
         # Find the valid credentials
-        valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'renewsliver', urns,
-                                                              check_sliver_callback=self.api.driver.check_sliver_credentials,
-                                                              options=options)
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(
+            creds, 'renewsliver', urns,
+            check_sliver_callback=self.api.driver.check_sliver_credentials,
+            options=options)
         the_credential = Credential(cred=valid_creds[0])
         actual_caller_hrn = the_credential.actual_caller_hrn()
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-urns: %s\texpiration:%s\tmethod-name: %s" %
-                             (self.api.interface, actual_caller_hrn, urns, expiration_time, self.name))
+        logger.info("interface: %s\tcaller-hrn: %s\ttarget-urns: %s\texpiration:%s\tmethod-name: %s" %
+                    (self.api.interface, actual_caller_hrn, urns, expiration_time, self.name))
 
         # extend as long as possible : take the min of requested and
         # now+SFA_MAX_SLICE_RENEW
@@ -50,21 +52,21 @@ class Renew(Method):
         # Validate that the time does not go beyond the credential's expiration
         # time
         requested_expire = utcparse(expiration_time)
-        self.api.logger.info("requested_expire = %s" % requested_expire)
+        logger.info("requested_expire = %s" % requested_expire)
         credential_expire = the_credential.get_expiration()
-        self.api.logger.info("credential_expire = %s" % credential_expire)
+        logger.info("credential_expire = %s" % credential_expire)
         max_renew_days = int(self.api.config.SFA_MAX_SLICE_RENEW)
         max_expire = datetime.datetime.utcnow() + datetime.timedelta(days=max_renew_days)
         if requested_expire > credential_expire:
             # used to throw an InsufficientRights exception here, this was not
             # right
-            self.api.logger.warning("Requested expiration %s, after credential expiration (%s) -> trimming to the latter/sooner" %
-                                    (requested_expire, credential_expire))
+            logger.warning("Requested expiration %s, after credential expiration (%s) -> trimming to the latter/sooner" %
+                           (requested_expire, credential_expire))
             requested_expire = credential_expire
         if requested_expire > max_expire:
             # likewise
-            self.api.logger.warning("Requested expiration %s, after maximal expiration %s days (%s) -> trimming to the latter/sooner" %
-                                    (requested_expire, self.api.config.SFA_MAX_SLICE_RENEW, max_expire))
+            logger.warning("Requested expiration %s, after maximal expiration %s days (%s) -> trimming to the latter/sooner" %
+                           (requested_expire, self.api.config.SFA_MAX_SLICE_RENEW, max_expire))
             requested_expire = max_expire
 
         return self.api.manager.Renew(self.api, urns, creds, requested_expire, options)