diff options
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | src/metrics/newrelic/agent.py | 7 | ||||
| -rw-r--r-- | src/metrics/newrelic/platform.py | 2 | ||||
| -rw-r--r-- | src/metrics/scoreboard.py | 3 |
4 files changed, 12 insertions, 2 deletions
@@ -4,7 +4,7 @@ from setuptools import setup setup_kwargs = dict( name = 'mod_wsgi-metrics', - version = '1.1.0', + version = '1.1.1', description = 'Metrics package for Apache/mod_wsgi.', author = 'Graham Dumpleton', author_email = 'Graham.Dumpleton@gmail.com', 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() diff --git a/src/metrics/newrelic/platform.py b/src/metrics/newrelic/platform.py index 302bac0..78d434a 100644 --- a/src/metrics/newrelic/platform.py +++ b/src/metrics/newrelic/platform.py @@ -147,7 +147,7 @@ class Client(object): elif response.status != 200: _logger.warning('An unexpected HTTP response was received ' 'from the data collector of %r. The payload for ' - 'the request was %r.', respnse.status, payload) + 'the request was %r.', response.status, payload) raise Client.DiscardDataForRequest() diff --git a/src/metrics/scoreboard.py b/src/metrics/scoreboard.py index df37ac9..ef42dc4 100644 --- a/src/metrics/scoreboard.py +++ b/src/metrics/scoreboard.py @@ -503,6 +503,9 @@ class Scoreboard(object): continue + except NotImplementedError: + pass + except Exception: raise |