simono41/pyicloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Charge HTTP logging to separate child logger of each service

Browse source 
Unfortunately log filters only apply to each logger, not to its
children, so we have to make sure the http child loggers has the
same password filter as the root base filter.
This commit is contained in:
Tor Arne Vestbø 2016-03-06 18:04:59 +01:00
parent c96a3bdc9f
commit b2f0cb992c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pyicloud/base.py
View file

@ -57,7 +57,9 @@ class PyiCloudSession(requests.Session):
# Charge logging to the right service endpoint # Charge logging to the right service endpoint
callee = inspect.stack()[2] callee = inspect.stack()[2]
module = inspect.getmodule(callee[0]) module = inspect.getmodule(callee[0])
logger = logging.getLogger(module.__name__) logger = logging.getLogger(module.__name__).getChild('http')
if self.service._password_filter not in logger.filters:
logger.addFilter(self.service._password_filter)
logger.debug("%s %s %s", args[0], args[1], kwargs.get('data', '')) logger.debug("%s %s %s", args[0], args[1], kwargs.get('data', ''))
@ -116,7 +118,9 @@ class PyiCloudService(object):
self.data = {} self.data = {}
self.client_id = str(uuid.uuid1()).upper() self.client_id = str(uuid.uuid1()).upper()
self.user = {'apple_id': apple_id, 'password': password} self.user = {'apple_id': apple_id, 'password': password}
logger.addFilter(PyiCloudPasswordFilter(password))
self._password_filter = PyiCloudPasswordFilter(password)
logger.addFilter(self._password_filter)
self._home_endpoint = 'https://www.icloud.com' self._home_endpoint = 'https://www.icloud.com'
self._setup_endpoint = 'https://setup.icloud.com/setup/ws/1' self._setup_endpoint = 'https://setup.icloud.com/setup/ws/1'