Using logging filters from edx-django-utils (#25492)

The UserIdFilter and RemoteIpFilter logging filter classes
were moved from edx-platform to edx-django-utils for more
distributed use. This updated removes those classes from
edx-platform, and references their counterparts in
edx-django-utils.

ENT-3494
This commit is contained in:
Mike OConnell
2020-11-02 21:40:59 -05:00
committed by GitHub
parent acd84598c9
commit dbf6ef22df
3 changed files with 3 additions and 37 deletions

View File

@@ -1,34 +0,0 @@
"""
Django-based logging utilities
UserIdFilter: A logging.Filter that adds userid to the logging context
RemoteIpFilter: A logging filter that adds the remote IP to the logging context
"""
from logging import Filter
from crum import get_current_request
from crum import get_current_user
class UserIdFilter(Filter):
def filter(self, record):
user = get_current_user()
if user and user.pk:
record.userid = user.pk
else:
record.userid = None
return True
class RemoteIpFilter(Filter):
def filter(self, record):
# get IP from context
request = get_current_request()
if request and 'REMOTE_ADDR' in request.META:
record.remoteip = request.META['REMOTE_ADDR']
else:
record.remoteip = None
return True

View File

@@ -51,10 +51,10 @@ def get_logger_config(log_dir,
'()': 'django.utils.log.RequireDebugFalse',
},
'userid_context': {
'()': 'openedx.core.djangoapps.util.log_utils.UserIdFilter',
'()': 'edx_django_utils.logging.UserIdFilter',
},
'remoteip_context': {
'()': 'openedx.core.djangoapps.util.log_utils.RemoteIpFilter',
'()': 'edx_django_utils.logging.RemoteIpFilter',
}
},
'handlers': {

2
package-lock.json generated
View File

@@ -574,7 +574,7 @@
"aproba": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
},
"are-we-there-yet": {
"version": "1.1.5",