X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential.py;h=3e1fbcc642abdfd2883091ff8ad3499630957a0c;hb=3eea82897aba845da0d12c1ba56012e599f58853;hp=9b8d8f7e16281faa9a288036bfef04080a9112cf;hpb=b9bc3b9f03637049e3cc1e931e52aef93479f4ed;p=sfa.git

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index 9b8d8f7e..3e1fbcc6 100644
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -35,7 +35,7 @@ from xml.dom.minidom import Document, parseString
 from lxml import etree
 
 from sfa.util.faults import *
-from sfa.util.sfalogging import sfa_logger
+from sfa.util.sfalogging import logger
 from sfa.trust.certificate import Keypair
 from sfa.trust.credential_legacy import CredentialLegacy
 from sfa.trust.rights import Right, Rights
@@ -81,7 +81,7 @@ signature_template = \
 # Convert a string into a bool
 
 def str2bool(str):
-    if str.lower() in ['yes','true','1']:
+    if str.lower() in ['true','1']:
         return True
     return False
 
@@ -675,7 +675,7 @@ class Credential(object):
                 trusted_cert_objects.append(GID(filename=f))
                 ok_trusted_certs.append(f)
             except Exception, exc:
-                sfa_logger().error("Failed to load trusted cert from %s: %r"%( f, exc))
+                logger.error("Failed to load trusted cert from %s: %r"%( f, exc))
         trusted_certs = ok_trusted_certs
 
         # Use legacy verification if this is a legacy credential
@@ -759,7 +759,7 @@ class Credential(object):
         # Maybe should be (hrn, type) = urn_to_hrn(root_cred_signer.get_urn())
         root_cred_signer_type = root_cred_signer.get_type()
         if (root_cred_signer_type == 'authority'):
-            #sfa_logger().debug('Cred signer is an authority')
+            #logger.debug('Cred signer is an authority')
             # signer is an authority, see if target is in authority's domain
             hrn = root_cred_signer.get_hrn()
             if root_target_gid.get_hrn().startswith(hrn):