Skip to content

Commit

Permalink
Merge pull request #4379 from willkg/1442022-new-relic
Browse files Browse the repository at this point in the history
fix bug 1442022 - nix new relic
  • Loading branch information
willkg authored Mar 12, 2018
2 parents 064adbe + 39f815a commit a7057a5
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
1 change: 0 additions & 1 deletion docker/config/local_dev.env
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ AWS_SECRET_ACCESS_KEY=foo
CACHE_LOCATION=memcached:11211
DATABASE_URL=postgres://postgres:aPassword@postgresql:5432/breakpad
ELASTICSEARCH_URLS=http://elasticsearch:9200
NEWRELIC_PYTHON_INI_FILE=/etc/newrelic/newrelic.ini
OAUTH2_CLIENT_ID=
OAUTH2_CLIENT_SECRET=
RABBITMQ_HOST=rabbitmq
Expand Down
2 changes: 0 additions & 2 deletions requirements/default.txt
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ datadog==0.19.0 \
freezegun==0.3.9 \
--hash=sha256:8842688de9497c82ecb40c30274ecc676e97ac78765b0ade105a97063d5b7a11 \
--hash=sha256:783ccccd7f60968bfe49ad9e114c18ea2b63831faaaf61c1f1f71ddfde1c0eee
newrelic==2.106.0.87 \
--hash=sha256:8f66edadcf8db74836fa804fcdd19d3fcfe9e080a8db411af34f2a9148e29eac
contextlib2==0.5.5 \
--hash=sha256:f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00 \
--hash=sha256:509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48
Expand Down
21 changes: 0 additions & 21 deletions webapp-django/wsgi/socorro-crashstats.py
Original file line number Diff line number Diff line change
@@ -1,29 +1,8 @@
from __future__ import print_function

import os
import sys

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'crashstats.settings')

from django.core.wsgi import get_wsgi_application # noqa
application = get_wsgi_application()


try:
import newrelic.agent
except ImportError:
newrelic = False


if newrelic:
newrelic_ini = os.getenv('NEWRELIC_PYTHON_INI_FILE', None)
if newrelic_ini:
if os.path.isfile(newrelic_ini):
newrelic.agent.initialize(newrelic_ini)
application = newrelic.agent.wsgi_application()(application)
else:
print(
"NEWRELIC_PYTHON_INI_FILE set but file does not exist. "
"Skipping to initialize newrelic agent.",
file=sys.stderr
)

0 comments on commit a7057a5

Please sign in to comment.