added configurable default parameters

wolph · wolph · commit 7a5f9bd6e902 · 2012-03-12T02:42:52.000+01:00
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name = 'python-statsd',
-    version = '1.3',
+    version = '1.4',
     author = 'Rick van Hattem',
     author_email = 'Rick.van.Hattem@Fawo.nl',
     description = '''statsd is a client for Etsy's node-js statsd server. 
diff --git a/statsd/__init__.py b/statsd/__init__.py
@@ -3,5 +3,6 @@
 from statsd.timer import Timer
 from statsd.counter import Counter, increment, decrement
 
-__all__ = ['Client', 'Connection', 'Timer', 'Counter', 'increment', 'decrement']
+__all__ = ['Client', 'Connection', 'Timer', 'Counter', 'increment',
+    'decrement']
 
diff --git a/statsd/client.py b/statsd/client.py
@@ -13,8 +13,8 @@ class Client(object):
     #: prefixed by name
     name = None
 
-    #: The :class:`~statsd.connection.Connection` to use, creates a new connection if no \
-    #: connection is given
+    #: The :class:`~statsd.connection.Connection` to use, creates a new
+    #: connection if no connection is given
     connection = None
 
     def __init__(self, name, connection=None):
@@ -27,6 +27,7 @@ def __init__(self, name, connection=None):
 
     @classmethod
     def _get_name(cls, *name_parts):
+
         def to_str(value):
             if isinstance(value, unicode):
                 value = value.encode('utf-8', 'replace')
@@ -43,8 +44,8 @@ def get_client(self, name=None, class_=None):
         :keyword name: The name to use, if the name for this client was `spam`
             and the `name` argument is `eggs` than the resulting name will be
             `spam.eggs`
-        :keyword class_: The :class:`~statsd.client.Client` subclass to use (e.g.
-            :class:`~statsd.Timer` or :class:`~statsd.counter.Counter`)
+        :keyword class_: The :class:`~statsd.client.Client` subclass to use
+            (e.g. :class:`~statsd.Timer` or :class:`~statsd.counter.Counter`)
         '''
 
         # If the name was given, use it. Otherwise simply clone
diff --git a/statsd/connection.py b/statsd/connection.py
@@ -11,10 +11,20 @@ class Connection(object):
     :keyword sample_rate: The sample rate, defaults to `1` (meaning always)
     '''
 
-    def __init__(self, host='localhost', port=8125, sample_rate=1):
-        self._host = host or 'localhost'
-        self._port = int(port) or 8125
-        self._sample_rate = sample_rate or 1.0
+    default_host = 'localhost'
+    default_port = 8125
+    default_sample_rate = 1
+
+    @classmethod
+    def set_defaults(cls, host='localhost', port=8125, sample_rate=1):
+        cls.default_host = host
+        cls.default_port = port
+        cls.default_sample_rate = sample_rate
+
+    def __init__(self, host=None, port=None, sample_rate=None):
+        self._host = host or self.default_host
+        self._port = int(port or self.default_port)
+        self._sample_rate = sample_rate or self.default_sample_rate
         self.logger = logging.getLogger('%s.%s'
             % (__name__, self.__class__.__name__))
         self.udp_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -54,3 +64,4 @@ def __repr__(self):
             self._port,
             self._sample_rate,
         )
+
diff --git a/statsd/counter.py b/statsd/counter.py
@@ -69,9 +69,11 @@ def __sub__(self, delta):
         self.decrement(delta=delta)
         return self
 
+
 def increment(key):
-    counter = Counter(key).increment()
+    return Counter(key).increment()
+
 
 def decrement(key):
-    counter = Counter(key).decrement()
+    return Counter(key).decrement()
 
diff --git a/statsd/timer.py b/statsd/timer.py
@@ -10,7 +10,7 @@ class Timer(statsd.Client):
 
     >>> timer = Timer('application_name')
     >>> timer.start()
-    >>> # do something
+    >>>  # do something
     >>> timer.stop('executed_action')
     '''
 
@@ -86,12 +86,12 @@ def decorate(self, function_or_name):
 
         >>> from statsd import Timer
         >>> timer = Timer('application_name')
-        >>> 
+        >>>
         >>> @timer.decorate
         ... def some_function():
         ...     # resulting timer name: application_name.some_function
         ...     pass
-        >>> 
+        >>>
         >>> @timer.decorate('my_timer')
         ... def some_function():
         ...     # resulting timer name: application_name.my_timer
@@ -103,6 +103,7 @@ def decorate(self, function_or_name):
         else:
             return self._decorate(function_or_name.__name__, function_or_name)
 
+
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
