From 4359808fe0c7e36d8ec7af9555c06481d0eac21d Mon Sep 17 00:00:00 2001 From: Matt Nibecker Date: Wed, 18 Jan 2017 15:10:00 -0800 Subject: [PATCH 1/3] fix emitter hack --- snowplow_tracker/emitters.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/snowplow_tracker/emitters.py b/snowplow_tracker/emitters.py index 2eccb0fb..7c34e6a9 100644 --- a/snowplow_tracker/emitters.py +++ b/snowplow_tracker/emitters.py @@ -52,16 +52,6 @@ new_contract("redis", lambda x: isinstance(x, (redis.Redis, redis.StrictRedis))) -try: - # Check whether a custom Celery configuration module named "snowplow_celery_config" exists - import snowplow_celery_config - app = Celery() - app.config_from_object(snowplow_celery_config) - -except ImportError: - # Otherwise configure Celery with default settings - app = Celery("Snowplow", broker="redis://guest@localhost//") - class Emitter(object): """ @@ -172,7 +162,6 @@ def reached_limit(self): else: return self.bytes_queued >= self.byte_limit or len(self.buffer) >= self.buffer_size - @task(name="Flush") def flush(self): """ Sends all events in the buffer to the collector. From aaa013e1b9d9590961f1a1e5dde5ae62fb1e0e09 Mon Sep 17 00:00:00 2001 From: Matt Nibecker Date: Mon, 30 Jan 2017 09:36:36 -0800 Subject: [PATCH 2/3] Fix logging --- snowplow_tracker/__init__.py | 7 ++++++- snowplow_tracker/emitters.py | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/snowplow_tracker/__init__.py b/snowplow_tracker/__init__.py index 8a2062dd..fdf9d611 100644 --- a/snowplow_tracker/__init__.py +++ b/snowplow_tracker/__init__.py @@ -1,6 +1,11 @@ from snowplow_tracker._version import __version__ from snowplow_tracker.subject import Subject -from snowplow_tracker.emitters import logger, Emitter, AsyncEmitter, CeleryEmitter, RedisEmitter +from snowplow_tracker.emitters import Emitter, AsyncEmitter, CeleryEmitter, RedisEmitter from snowplow_tracker.self_describing_json import SelfDescribingJson from snowplow_tracker.tracker import Tracker from contracts import disable_all as disable_contracts, enable_all as enable_contracts +import logging + +# Set default logging handler to avoid "No handler found" warnings. +logging.getLogger(__name__).addHandler(logging.NullHandler()) + diff --git a/snowplow_tracker/emitters.py b/snowplow_tracker/emitters.py index 7c34e6a9..1dcb269e 100644 --- a/snowplow_tracker/emitters.py +++ b/snowplow_tracker/emitters.py @@ -39,7 +39,6 @@ from snowplow_tracker.self_describing_json import SelfDescribingJson logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) DEFAULT_MAX_LENGTH = 10 PAYLOAD_DATA_SCHEMA = "iglu:com.snowplowanalytics.snowplow/payload_data/jsonschema/1-0-4" From 72082ea4adcba23be8d82173ad452f6236f553a2 Mon Sep 17 00:00:00 2001 From: Matt Nibecker Date: Mon, 30 Jan 2017 10:09:12 -0800 Subject: [PATCH 3/3] Make tracker inherit from new-class style --- snowplow_tracker/tracker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowplow_tracker/tracker.py b/snowplow_tracker/tracker.py index a6830a68..4366b571 100644 --- a/snowplow_tracker/tracker.py +++ b/snowplow_tracker/tracker.py @@ -53,7 +53,7 @@ """ -class Tracker: +class Tracker(object): new_contract("not_none", lambda s: s is not None)