diff --git a/compose/django/docker_start.sh b/compose/django/docker_start.sh index ce278dcf..d78b21d7 100644 --- a/compose/django/docker_start.sh +++ b/compose/django/docker_start.sh @@ -15,4 +15,4 @@ else python /app/manage.py migrate fi -/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:7555 --chdir=/app -k uvicorn.workers.UvicornWorker +newrelic-admin run-program gunicorn config.asgi --bind 0.0.0.0:7555 --chdir=/app -k uvicorn.workers.UvicornWorker diff --git a/env_secrets/prod-azure.json b/env_secrets/prod-azure.json index 6e7b30d5..453296ed 100644 Binary files a/env_secrets/prod-azure.json and b/env_secrets/prod-azure.json differ diff --git a/server/config/urls.py b/server/config/urls.py index 325013b0..98bf6f48 100644 --- a/server/config/urls.py +++ b/server/config/urls.py @@ -10,9 +10,6 @@ from django.views import defaults as default_views from django.views.decorators.csrf import csrf_exempt from django_ratelimit.exceptions import Ratelimited from graphene_django.views import GraphQLView -from wagtail import urls as wagtail_urls -from wagtail.admin import urls as wagtailadmin_urls -from wagtail.documents import urls as wagtaildocs_urls from vbv_lernwelt.assignment.views import request_assignment_completion_status from vbv_lernwelt.core.middleware.auth import django_view_authentication_exempt @@ -56,6 +53,9 @@ from vbv_lernwelt.importer.views import ( t2l_sync, ) from vbv_lernwelt.notify.views import email_notification_settings +from wagtail import urls as wagtail_urls +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.documents import urls as wagtaildocs_urls class SignedIntConverter(IntConverter): diff --git a/server/requirements/requirements-dev.txt b/server/requirements/requirements-dev.txt index 2a2abafb..04cf3105 100644 --- a/server/requirements/requirements-dev.txt +++ b/server/requirements/requirements-dev.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # -# pip-compile requirements-dev.in +# pip-compile --output-file=requirements-dev.txt requirements-dev.in # aniso8601==9.0.1 # via graphene @@ -313,6 +313,8 @@ mypy-extensions==1.0.0 # black # mypy # typing-inspect +newrelic==8.11.0 + # via -r requirements.in nodeenv==1.8.0 # via pre-commit openpyxl==3.1.2 diff --git a/server/requirements/requirements.in b/server/requirements/requirements.in index 2a9a18ca..a47be82c 100644 --- a/server/requirements/requirements.in +++ b/server/requirements/requirements.in @@ -50,3 +50,4 @@ azure-identity boto3 openpyxl +newrelic diff --git a/server/requirements/requirements.txt b/server/requirements/requirements.txt index c205e184..30ae967d 100644 --- a/server/requirements/requirements.txt +++ b/server/requirements/requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # -# pip-compile requirements.in +# pip-compile --output-file=requirements.txt requirements.in # aniso8601==9.0.1 # via graphene @@ -196,6 +196,8 @@ msal==1.23.0 # msal-extensions msal-extensions==1.0.0 # via azure-identity +newrelic==8.11.0 + # via -r requirements.in openpyxl==3.1.2 # via # -r requirements.in