From 05f3c5fd199180206dc3c49e967fc9cc18029a8f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 Jan 2013 20:26:11 -0600 Subject: Load key before importing newrelic Their code stupidly grabs the environment variable during import, not during the initialize call. Signed-off-by: Dan McGee --- .gitignore | 1 + archweb.wsgi | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7ecfa380..5362f518 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ local_settings.py archweb.db archweb.db-* +newrelic.key tags collected_static/ testing/ diff --git a/archweb.wsgi b/archweb.wsgi index 901ac98f..f8de2b49 100644 --- a/archweb.wsgi +++ b/archweb.wsgi @@ -14,14 +14,15 @@ os.chdir(base_path) using_newrelic = False try: + key_path = os.path.join(base_path, "newrelic.key") + if os.path.exists(key_path): + with open(key_path) as keyfile: + key = keyfile.read().strip() + os.environ["NEW_RELIC_LICENSE_KEY"] = key + import newrelic.agent from newrelic.api.exceptions import ConfigurationError try: - key_path = os.path.join(base_path, "newrelic.key") - if os.path.exists(key_path): - with open(key_path) as keyfile: - key = keyfile.read().strip() - os.environ["NEW_RELIC_LICENSE_KEY"] = key newrelic.agent.initialize(os.path.join(base_path, "newrelic.ini")) using_newrelic = True except ConfigurationError: -- cgit v1.2.3-55-g3dc8