summaryrefslogtreecommitdiff
path: root/src/metrics/newrelic/agent.py
diff options
context:
space:
mode:
authorGraham Dumpleton <Graham.Dumpleton@gmail.com>2014-12-24 12:08:26 +1100
committerGraham Dumpleton <Graham.Dumpleton@gmail.com>2014-12-24 12:08:26 +1100
commitec715eb593255229f9f45f3f323edbb845c691d8 (patch)
treeba546c840c4fe77543bb95d541e8d24373b7bf0e /src/metrics/newrelic/agent.py
parent868373bfb40809d681a6981872f7af68e2aaadc8 (diff)
parent7baf7681226144e62ccce1c8c4edfeddbbdacf67 (diff)
downloadmod_wsgi-metrics-master.tar.gz
Merge branch 'release/1.1.1'HEAD1.1.1master
Diffstat (limited to 'src/metrics/newrelic/agent.py')
-rw-r--r--src/metrics/newrelic/agent.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/metrics/newrelic/agent.py b/src/metrics/newrelic/agent.py
index 86ac388..f78023a 100644
--- a/src/metrics/newrelic/agent.py
+++ b/src/metrics/newrelic/agent.py
@@ -71,6 +71,13 @@ def configuration_settings(app_name=None, license_key=None,
license_key = os.environ.get('NEW_RELIC_LICENSE_KEY', None)
license_key = option('license_key', default=license_key)
+ else:
+ if app_name is None:
+ app_name = os.environ.get('NEW_RELIC_APP_NAME', None)
+
+ if license_key is None:
+ license_key = os.environ.get('NEW_RELIC_LICENSE_KEY', None)
+
if app_name is not None:
app_name = app_name.split(';')[0].strip()