altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Added scout-apm to the requirements and added settings scaffolding.

Browse source 
- Legacy-Id: 19399
This commit is contained in:
Robert Sparks 2021-10-07 16:39:29 +00:00
parent 6f609e1b31
commit a8aab5cb17
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -26,6 +26,8 @@ ietfdb (7.39.0) ietf; urgency=medium
* Merged in [19396] from rjsparks@nostrum.com: * Merged in [19396] from rjsparks@nostrum.com:
Provide a metadata endpoint to assist rfcdiff.pyht. Provide a metadata endpoint to assist rfcdiff.pyht.
* Added scout-apm to requirements and added settings scaffolding.
-- Robert Sparks <rjsparks@nostrum.com> 07 Oct 2021 15:20:42 +0000 -- Robert Sparks <rjsparks@nostrum.com> 07 Oct 2021 15:20:42 +0000

6
ietf/settings.py
View file

@ -1051,6 +1051,7 @@ BADNESS_MUCHTOOBIG = 500
# Set debug apps in settings_local.DEV_APPS # Set debug apps in settings_local.DEV_APPS
DEV_APPS = [] # type: List[str] DEV_APPS = [] # type: List[str]
DEV_PRE_APPS = []
DEV_MIDDLEWARE = () DEV_MIDDLEWARE = ()
# django-debug-toolbar and the debug listing of sql queries at the bottom of # django-debug-toolbar and the debug listing of sql queries at the bottom of
@ -1226,9 +1227,12 @@ for app in INSTALLED_APPS:
# Add DEV_APPS to INSTALLED_APPS # Add DEV_APPS to INSTALLED_APPS
INSTALLED_APPS += DEV_APPS INSTALLED_APPS += DEV_APPS
INSTALLED_APPS = DEV_PRE_APPS + INSTALLED_APPS
MIDDLEWARE += DEV_MIDDLEWARE MIDDLEWARE += DEV_MIDDLEWARE
TEMPLATES[0]['OPTIONS']['context_processors'] += DEV_TEMPLATE_CONTEXT_PROCESSORS TEMPLATES[0]['OPTIONS']['context_processors'] += DEV_TEMPLATE_CONTEXT_PROCESSORS
if SERVER_MODE == 'production':
INSTALLED_APPS.insert(0,'scout_apm.django')
# We provide a secret key only for test and development modes. It's # We provide a secret key only for test and development modes. It's
# absolutely vital that django fails to start in production mode unless a # absolutely vital that django fails to start in production mode unless a
@ -1288,4 +1292,4 @@ if SERVER_MODE != 'production':
CSRF_COOKIE_SAMESITE = 'Lax' CSRF_COOKIE_SAMESITE = 'Lax'
SESSION_COOKIE_SECURE = False SESSION_COOKIE_SECURE = False
SESSION_COOKIE_SAMESITE = 'Lax' SESSION_COOKIE_SAMESITE = 'Lax'

1
requirements.txt
View file

@ -60,6 +60,7 @@ pytz>=2014.7
requests!=2.12.* requests!=2.12.*
requests-mock>=1.8 requests-mock>=1.8
rfc2html>=2.0.1 rfc2html>=2.0.1
scout-apm>=2.23.0
selenium>=3.9.0 selenium>=3.9.0
six>=1.10.0 six>=1.10.0
svn>=1.0.1 svn>=1.0.1