Merge pull request #549 from minrk/optional-statsd

Make statsd an optional dependency

jupyterhub/app.py

@@ -12,7 +12,6 @@ import signal
 import socket
 import sys
 import threading
-import statsd
 from datetime import datetime
 from distutils.version import LooseVersion as V
 from getpass import getuser
@@ -508,21 +507,20 @@ class JupyterHub(Application):
         help="Extra log handlers to set on JupyterHub logger",
     ).tag(config=True)
     
-    @property
+    statsd = Any(allow_none=False, help="The statsd client, if any. A mock will be used if we aren't using statsd")
-    def statsd(self):
+    @default('statsd')
-        if hasattr(self, '_statsd'):
+    def _statsd(self):
-            return self._statsd
         if self.statsd_host:
-            self._statsd = statsd.StatsClient(
+            import statsd
+            client = statsd.StatsClient(
                 self.statsd_host,
                 self.statsd_port,
                 self.statsd_prefix
             )
-            return self._statsd
+            return client
         else:
             # return an empty mock object!
-            self._statsd = EmptyClass()
+            return EmptyClass()
-            return self._statsd
 
     def init_logging(self):
         # This prevents double log messages because tornado use a root logger that

requirements.txt

@@ -2,6 +2,5 @@ traitlets>=4.1
 tornado>=4.1
 jinja2
 pamela
-statsd
 sqlalchemy>=1.0
 requests