Merge branch 'master' into master

CHANGELOG.txt

@@ -1,6 +1,7 @@
 === (ongoing - to be released as 1.4.0) ===
 
 - Added Dockerfile for running tests against a real instance
+- Improved util functions
 
 === 1.3.0 ===
 

README.rst

@@ -11,8 +11,8 @@ much better way.
 Prerequisites
 -------------
 
-This module has celery as a dependency but you don't have to use it, if you
-don't want to.
+This module has celery support but you don't have to use it, if you don't want
+to.
 
 Installation
 ------------
@@ -246,7 +246,7 @@ If you want to contribute to this project, please perform the following steps
 Runing tests
 ------------
 
-For running the tests [Docker](https://docs.docker.com/) and 
+For running the tests [Docker](https://docs.docker.com/) and
 [Docker compose](https://www.docker.com/products/docker-compose) is required.
 
 The test setup a Influxdb database for testing against real queries.

influxdb_metrics/middleware.py

@@ -7,14 +7,15 @@
     import urlparse as parse
 
 from django.conf import settings
+from django.utils.deprecation import MiddlewareMixin
 
 from tld import get_tld
 from tld.exceptions import TldBadUrl, TldDomainNotFound, TldIOError
 
 from .loader import write_points
 
 
-class InfluxDBRequestMiddleware(object):
+class InfluxDBRequestMiddleware(MiddlewareMixin):
     """
     Measures request time and sends metric to InfluxDB.
 

influxdb_metrics/tasks.py

@@ -1,7 +1,13 @@
 """Celery tasks for the influxdb_metrics app."""
 from __future__ import absolute_import
 
-from celery import shared_task
+try:
+    from celery import shared_task
+except ImportError:
+    def shared_task(func):
+        def wrapper(*args, **kwargs):
+            return func(*args, **kwargs)
+        return wrapper
 
 from .utils import write_points as write_points_normal
 

influxdb_metrics/utils.py

@@ -1,11 +1,15 @@
 """Utilities for working with influxdb."""
+import logging
 from threading import Thread
 
 from django.conf import settings
 
 from influxdb import InfluxDBClient
 
 
+logger = logging.getLogger(__name__)
+
+
 def get_client():
     """Returns an ``InfluxDBClient`` instance."""
     return InfluxDBClient(
@@ -45,18 +49,18 @@ def write_points(data, force_disable_threading=False):
     if force_disable_threading:
         use_threading = False
     if use_threading is True:
-        thread = Thread(target=write_points_threaded, args=(client, data, ))
+        thread = Thread(target=process_points, args=(client, data, ))
         thread.start()
     else:
-        client.write_points(data)
+        process_points(client, data)
 
 
-def write_points_threaded(client, data):  # pragma: no cover
+def process_points(client, data):  # pragma: no cover
     """Method to be called via threading module."""
     try:
         client.write_points(data)
     except Exception as err:
         if getattr(settings, 'INFLUXDB_FAIL_SILENTLY', True):
-            pass
+            logger.error(err)
         else:
-            raise err.message
+            raise err

requirements.txt

@@ -1,4 +1,3 @@
-celery
 django
 influxdb
 tld

setup.py

@@ -33,7 +33,6 @@
 
 
 install_requires = [
-    'celery>=3.0.0',
     'django>=1.6',
     'influxdb>=2.9.1',
     'tld',