Permalink
Browse files

Move default instances out of __init__.py

  • Loading branch information...
1 parent 269565b commit 043281baad434788013276c05eb8a030d7cce5b2 @jsocol committed May 9, 2014
Showing with 35 additions and 37 deletions.
  1. +1 −37 statsd/__init__.py
  2. +4 −0 statsd/defaults/__init__.py
  3. +15 −0 statsd/defaults/django.py
  4. +15 −0 statsd/defaults/env.py
View
@@ -1,44 +1,8 @@
from __future__ import absolute_import
-import os
-import socket
-
-try:
- from django.conf import settings
- from django.core.exceptions import ImproperlyConfigured
- try:
- # This handles the case where Django >=1.5 is in the python path
- # but this particular project is not a django project. In
- # that case, settings aren't configured.
- getattr(settings, 'STATSD_HOST', 'localhost')
- except ImproperlyConfigured:
- settings = None
-except ImportError:
- settings = None
from .client import StatsClient
VERSION = (2, 1, 2)
__version__ = '.'.join(map(str, VERSION))
-__all__ = ['StatsClient', 'statsd']
-
-statsd = None
-
-if settings:
- try:
- host = getattr(settings, 'STATSD_HOST', 'localhost')
- port = getattr(settings, 'STATSD_PORT', 8125)
- prefix = getattr(settings, 'STATSD_PREFIX', None)
- maxudpsize = getattr(settings, 'STATSD_MAXUDPSIZE', 512)
- statsd = StatsClient(host, port, prefix, maxudpsize)
- except (socket.error, socket.gaierror, ImportError):
- pass
-elif 'STATSD_HOST' in os.environ:
- try:
- host = os.environ['STATSD_HOST']
- port = int(os.environ['STATSD_PORT'])
- prefix = os.environ.get('STATSD_PREFIX')
- maxudpsize = int(os.environ.get('STATSD_MAXUDPSIZE', 512))
- statsd = StatsClient(host, port, prefix, maxudpsize)
- except (socket.error, socket.gaierror, KeyError):
- pass
+__all__ = ['StatsClient']
@@ -0,0 +1,4 @@
+HOST = 'localhost'
+PORT = 8125
+PREFIX = None
+MAXUDPSIZE = 512
View
@@ -0,0 +1,15 @@
+from __future__ import absolute_import
+from django.conf import settings
+
+from statsd import defaults
+from statsd.client import StatsClient
+
+
+statsd = None
+
+if statsd is None:
+ host = getattr(settings, 'STATSD_HOST', defaults.HOST)
+ port = getattr(settings, 'STATSD_PORT', defaults.PORT)
+ prefix = getattr(settings, 'STATSD_PREFIX', defaults.PREFIX)
+ maxudpsize = getattr(settings, 'STATSD_MAXUDPSIZE', defaults.MAXUDPSIZE)
+ statsd = StatsClient(host, port, prefix, maxudpsize)
View
@@ -0,0 +1,15 @@
+from __future__ import absolute_import
+import os
+
+from statsd import defaults
+from statsd.client import StatsClient
+
+
+statsd = None
+
+if statsd is None:
+ host = os.getenv('STATSD_HOST', defaults.HOST)
+ port = int(os.getenv('STATSD_PORT', defaults.PORT))
+ prefix = os.getenv('STATSD_PREFIX', defaults.PREFIX)
+ maxudpsize = int(os.getenv('STATSD_MAXUDPSIZE', defaults.MAXUDPSIZE))
+ statsd = StatsClient(host, port, prefix, maxudpsize)

0 comments on commit 043281b

Please sign in to comment.