Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
2727b297
Commit
2727b297
authored
Nov 29, 2018
by
Thom Wiggers
📐
Browse files
Merge branch 'replace-raven-by-sentrysdk' into 'master'
Replace raven by sentrysdk Closes
#758
See merge request
!1032
parents
983ad0c8
0ac6494d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Pipfile
View file @
2727b297
...
...
@@ -16,7 +16,6 @@ django-libsass = "*"
django-cors-headers
=
"*"
python-magic
=
"*"
redis
=
"*"
raven
=
"*"
Django
=
">
=
2.1
,
<
2.2
"
Pillow
=
"*"
django_compressor
=
"*"
...
...
@@ -26,6 +25,7 @@ bcrypt = "*"
uWSGI
=
"*"
"django-bootstrap4"
=
"*"
firebase-admin
=
"*"
sentry-sdk
=
"*"
[dev-packages]
django-template-check
=
"*"
...
...
Pipfile.lock
View file @
2727b297
{
"_meta"
:
{
"hash"
:
{
"sha256"
:
"
24422ed4d4ab21978c31bc550d14ef87328366a5ebaf3903efd91ddbe34af434
"
"sha256"
:
"
037fc0d13c0922412ba0404ee0117e0049efe08f11fd497939eb6fc1a3d556bc
"
},
"pipfile-spec"
:
6
,
"requires"
:
{},
...
...
@@ -528,14 +528,6 @@
],
"version"
:
"==2018.7"
},
"raven"
:
{
"hashes"
:
[
"sha256:3fd787d19ebb49919268f06f19310e8112d619ef364f7989246fc8753d469888"
,
"sha256:95f44f3ea2c1b176d5450df4becdb96c15bf2632888f9ab193e9dd22300ce46a"
],
"index"
:
"pypi"
,
"version"
:
"==6.9.0"
},
"rcssmin"
:
{
"hashes"
:
[
"sha256:ca87b695d3d7864157773a61263e5abb96006e9ff0e021eff90cbe0e1ba18270"
...
...
@@ -571,6 +563,14 @@
],
"version"
:
"==4.0"
},
"sentry-sdk"
:
{
"hashes"
:
[
"sha256:7625cfc4eb3673997a757a0f367c6899beda15e447becb6571fa95a3134c0ce8"
,
"sha256:c6e045a876d78270ba596b14a2faa95e235b6d896dd681b6fdcb00b705aafaaf"
],
"index"
:
"pypi"
,
"version"
:
"==0.5.5"
},
"six"
:
{
"hashes"
:
[
"sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"
,
...
...
website/thaliawebsite/settings/production.py
View file @
2727b297
...
...
@@ -11,10 +11,10 @@ See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/
import
json
import
os
from
.
import
settings
import
sentry_sdk
from
sentry_sdk.integrations.django
import
DjangoIntegration
INSTALLED_APPS
=
settings
.
INSTALLED_APPS
INSTALLED_APPS
.
append
(
'raven.contrib.django.raven_compat'
)
from
.
import
settings
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
...
...
@@ -138,10 +138,6 @@ LOGGING = {
'()'
:
'django.utils.log.RequireDebugFalse'
,
},
},
'root'
:
{
'level'
:
'WARNING'
,
'handlers'
:
[
'sentry'
],
},
'formatters'
:
{
'verbose'
:
{
'format'
:
'%(levelname)s %(asctime)s %(module)s '
...
...
@@ -154,33 +150,18 @@ LOGGING = {
'class'
:
'logging.StreamHandler'
,
'formatter'
:
'verbose'
},
'sentry'
:
{
'level'
:
'ERROR'
,
'filters'
:
[
'require_debug_false'
],
'class'
:
'raven.contrib.django.raven_compat.'
'handlers.SentryHandler'
,
},
},
'loggers'
:
{
'django'
:
{
'handlers'
:
[
'console'
],
'level'
:
'INFO'
,
},
'raven'
:
{
'level'
:
'INFO'
,
'handlers'
:
[
'console'
],
'propagate'
:
False
,
},
'sentry.errors'
:
{
'level'
:
'INFO'
,
'handlers'
:
[
'console'
],
'propagate'
:
False
,
},
},
}
RAVEN_CONFIG
=
{
'dsn'
:
os
.
environ
.
get
(
'SENTRY_DSN'
),
'release'
:
os
.
environ
.
get
(
'SOURCE_COMMIT'
),
}
sentry_sdk
.
init
(
dsn
=
os
.
environ
.
get
(
'SENTRY_DSN'
),
integrations
=
[
DjangoIntegration
()],
release
=
os
.
environ
.
get
(
'SOURCE_COMMIT'
),
send_default_pii
=
True
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment