Skip to content

Commit

Permalink
various linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Zsailer committed Oct 2, 2019
1 parent fb2e4e9 commit 4d146a3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 15 deletions.
7 changes: 2 additions & 5 deletions jupyter_telemetry/eventlog.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from datetime import datetime

import jsonschema
from pythonjsonlogger import jsonlogger
from ruamel.yaml import YAML
from traitlets import List
from traitlets.config import Configurable, Config
Expand Down Expand Up @@ -71,19 +70,17 @@ def __init__(self, *args, **kwargs):
setattr(handler, 'event_level', 'unclassified')
# Create a formatter for this handler.
formatter = JsonEventFormatter(
logger=self,
handler=handler,
logger=self,
handler=handler,
json_serializer=_skip_message
)
# Set formatted for handler.
handler.setFormatter(formatter)
self.log.addHandler(handler)


def _load_config(self, cfg, section_names=None, traits=None):
"""Load EventLog traits from a Config object, patching the
handlers trait in the Config object to avoid deepcopy errors.
"""
my_cfg = self._find_my_config(cfg)
handlers = my_cfg.pop("handlers", [])
Expand Down
13 changes: 6 additions & 7 deletions jupyter_telemetry/formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ def __init__(self, logger, handler, *args, **kwargs):

# Set the event logging level
if hasattr(self.handler, 'event_level'):
event_level = self.handler.event_level
event_level = self.handler.event_level
else:
event_level = 'unclassified'
event_level = 'unclassified'
self.setEventLevel(event_level)

super(JsonEventFormatter, self).__init__(*args, **kwargs)
Expand All @@ -50,14 +50,13 @@ def event_level(self):
def process_log_record(self, log_record):
log_record = super(JsonEventFormatter, self).process_log_record(log_record)
return self.process_event_levels(log_record)

def process_event_levels(self, log_record):
"""Removes any properties in a log_record that have an attribute `pii = True`.
"""
# Get schema for this log_record
key = (log_record['__schema__'], log_record['__version__'])
schema = self.logger.schemas[key]['properties']

# Logging keys that won't be in the schema.
ignored_keys = ['__schema__', '__timestamp__', '__version__', 'message']

Expand All @@ -67,8 +66,8 @@ def process_event_levels(self, log_record):
if key not in ignored_keys:
# Check if PII is listed in the schema.
if EVENT_MAP[schema[key]['level']] > EVENT_MAP[self.event_level]:
# If property's level is less than handler's level,
# If property's level is less than handler's level,
# delete this property from the log record.
del log_record[key]
return log_record

return log_record
3 changes: 1 addition & 2 deletions tests/test_eventlog.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def test_good_config_file(tmp_path):
# Pass config to EventLog
e = EventLog(config=cfg)

# Assert the
assert len(e.handlers) > 0
assert isinstance(e.handlers[0], logging.Handler)

Expand All @@ -49,4 +48,4 @@ def test_bad_config_file(tmp_path):
cfg = get_config_from_file(tmp_path, BAD_CONFIG)

with pytest.raises(TraitError):
e = EventLog(config=cfg)
EventLog(config=cfg)
2 changes: 1 addition & 1 deletion tests/test_register_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,4 @@ def test_record_event_badschema():
el.record_event('test/test', 1, {
'something': 'blah',
'status': 'not-in-enum'
})
})

0 comments on commit 4d146a3

Please sign in to comment.