Skip to content

Using logging filters from edx-django-utils #25492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moconnell1453 merged 1 commit into from
Nov 3, 2020
Merged

Using logging filters from edx-django-utils #25492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions openedx/core/djangoapps/util/log_utils.py
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions openedx/core/lib/logsettings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ django-config-models==2.0.3 # via -r requirements/edx/base.in, edx-enterprise
django-cookies-samesite==0.8.0 # via -r requirements/edx/base.in
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise
django-crum==0.7.7 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring, edx-rbac, edx-toggles, super-csv
django-crum==0.7.7 # via -r requirements/edx/base.in, edx-django-utils, edx-enterprise, edx-proctoring, edx-rbac, edx-toggles, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.in, edx-enterprise, edxval
django-filter==2.4.0 # via -r requirements/edx/base.in, edx-enterprise
django-ipware==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise, edx-proctoring
Expand Down Expand Up @@ -96,7 +96,7 @@ edx-celeryutils==0.5.2 # via -r requirements/edx/base.in, super-csv
edx-completion==3.2.4 # via -r requirements/edx/base.in
edx-django-release-util==0.4.4 # via -r requirements/edx/base.in
edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in
edx-django-utils==3.9.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when
edx-django-utils==3.10.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when
edx-drf-extensions==6.2.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.9.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
edx-i18n-tools==0.5.3 # via ora2
Expand Down Expand Up @@ -243,7 +243,7 @@ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-
git+https://github.com/open-craft/xblock-poll@1efd04bd6e16252a20e39a7516f9b69a000ace24#egg=xblock-poll==1.10.0 # via -r requirements/edx/github.in
xblock-utils==2.1.1 # via -r requirements/edx/base.in, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive
xblock==1.4.0 # via -r requirements/edx/base.in, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xmlsec==1.3.8 # via python3-saml
xmlsec==1.3.9 # via python3-saml
xss-utils==0.1.3 # via -r requirements/edx/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
6 changes: 3 additions & 3 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ django-config-models==2.0.3 # via -r requirements/edx/testing.txt, edx-enterpri
django-cookies-samesite==0.8.0 # via -r requirements/edx/testing.txt
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise
django-crum==0.7.7 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring, edx-rbac, edx-toggles, super-csv
django-crum==0.7.7 # via -r requirements/edx/testing.txt, edx-django-utils, edx-enterprise, edx-proctoring, edx-rbac, edx-toggles, super-csv
django-debug-toolbar==3.1.1 # via -r requirements/edx/development.in
django-fernet-fields==0.6 # via -r requirements/edx/testing.txt, edx-enterprise, edxval
django-filter==2.4.0 # via -r requirements/edx/testing.txt, edx-enterprise
Expand Down Expand Up @@ -107,7 +107,7 @@ edx-celeryutils==0.5.2 # via -r requirements/edx/testing.txt, super-csv
edx-completion==3.2.4 # via -r requirements/edx/testing.txt
edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt
edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt
edx-django-utils==3.9.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when
edx-django-utils==3.10.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when
edx-drf-extensions==6.2.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.9.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2
Expand Down Expand Up @@ -316,7 +316,7 @@ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-
git+https://github.com/open-craft/xblock-poll@1efd04bd6e16252a20e39a7516f9b69a000ace24#egg=xblock-poll==1.10.0 # via -r requirements/edx/testing.txt
xblock-utils==2.1.1 # via -r requirements/edx/testing.txt, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive
xblock==1.4.0 # via -r requirements/edx/testing.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xmlsec==1.3.8 # via -r requirements/edx/testing.txt, python3-saml
xmlsec==1.3.9 # via -r requirements/edx/testing.txt, python3-saml
xss-utils==0.1.3 # via -r requirements/edx/testing.txt
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata

Expand Down
6 changes: 3 additions & 3 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ django-config-models==2.0.3 # via -r requirements/edx/base.txt, edx-enterprise
django-cookies-samesite==0.8.0 # via -r requirements/edx/base.txt
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise
django-crum==0.7.7 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring, edx-rbac, edx-toggles, super-csv
django-crum==0.7.7 # via -r requirements/edx/base.txt, edx-django-utils, edx-enterprise, edx-proctoring, edx-rbac, edx-toggles, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.txt, edx-enterprise, edxval
django-filter==2.4.0 # via -r requirements/edx/base.txt, edx-enterprise
django-ipware==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise, edx-proctoring
Expand Down Expand Up @@ -104,7 +104,7 @@ edx-celeryutils==0.5.2 # via -r requirements/edx/base.txt, super-csv
edx-completion==3.2.4 # via -r requirements/edx/base.txt
edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt
edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt
edx-django-utils==3.9.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when
edx-django-utils==3.10.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when
edx-drf-extensions==6.2.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.9.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2
Expand Down Expand Up @@ -294,7 +294,7 @@ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-
git+https://github.com/open-craft/xblock-poll@1efd04bd6e16252a20e39a7516f9b69a000ace24#egg=xblock-poll==1.10.0 # via -r requirements/edx/base.txt
xblock-utils==2.1.1 # via -r requirements/edx/base.txt, edx-sga, lti-consumer-xblock, staff-graded-xblock, xblock-drag-and-drop-v2, xblock-google-drive
xblock==1.4.0 # via -r requirements/edx/base.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xmlsec==1.3.8 # via -r requirements/edx/base.txt, python3-saml
xmlsec==1.3.9 # via -r requirements/edx/base.txt, python3-saml
xss-utils==0.1.3 # via -r requirements/edx/base.txt
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, importlib-metadata

Expand Down