X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fplc%2Fapi.py;h=200d05c542084aa7666ac33c0b7b52acfd3d599e;hb=db091e73c33c373b7f6c2c96bd2caf6a2acf0178;hp=8e15ea79496eca4fa0858a65593b93605aae51f1;hpb=d2ef805930518b254a2e0f55b3ff66d83497dca8;p=sfa.git diff --git a/sfa/plc/api.py b/sfa/plc/api.py index 8e15ea79..200d05c5 100644 --- a/sfa/plc/api.py +++ b/sfa/plc/api.py @@ -12,7 +12,7 @@ import xmlrpclib from sfa.util.faults import * from sfa.util.api import * from sfa.util.config import * -from sfa.util.sfalogging import sfa_logger +from sfa.util.sfalogging import logger import sfa.util.xmlrpcprotocol as xmlrpcprotocol from sfa.trust.auth import Auth from sfa.trust.rights import Right, Rights, determine_rights @@ -106,7 +106,6 @@ class SfaAPI(BaseAPI): self.hrn = self.config.SFA_INTERFACE_HRN self.time_format = "%Y-%m-%d %H:%M:%S" - self.logger=sfa_logger() def getPLCShell(self): self.plauth = {'Username': self.config.SFA_PLC_USER, @@ -340,7 +339,7 @@ class SfaAPI(BaseAPI): # fill in key info if record['type'] == 'user': if 'key_ids' not in record: - self.logger.info("user record has no 'key_ids' - need to import from myplc ?") + logger.info("user record has no 'key_ids' - need to import from myplc ?") else: pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys] record['keys'] = pubkeys