Added Makefile, resolved shutdown() not terminating thread issue

Author: amar-jaiswal-haptik

Makefile

@@ -0,0 +1,11 @@
+release:
+	python3 setup.py sdist bdist_wheel
+	twine upload dist/*
+
+install:
+	python3 setup.py sdist bdist_wheel
+	pip3 install -e .
+
+.PHONY: release install
+
+

setup.py

@@ -12,12 +12,6 @@
 from track.version import VERSION  # noqa
 
 
-# 'setup.py publish' shortcut
-if sys.argv[-1] == 'publish':
-    os.system('python3 setup.py sdist bdist_wheel')
-    os.system('twine upload dist/*')
-    sys.exit()
-
 # TODO: update long description in README.md
 with open(file='README.md', mode='r', encoding='utf-8') as f:
     readme = f.read()

track/client.py

@@ -80,7 +80,7 @@ def flush(self):
         size = queue.qsize()
         queue.join()
         # Note that this message may not be precise, because of threading.
-        self.logger.debug('successfully flushed about %s items.', size)
+        self.logger.debug('Successfully flushed about %s items.', size)
 
     def join(self):
         """Ends the consumer thread once the queue is empty.

track/consumer.py

@@ -40,7 +40,7 @@ def upload(self):
         queue = self.queue
         queue_msg = None
         try:
-            queue_msg = queue.get(block=True)
+            queue_msg = queue.get(block=True, timeout=1)
         except Empty:
             self.logger.debug("queue is empty now")
 

track/request.py

@@ -43,5 +43,5 @@ def __init__(self, status, code, message):
         self.code = code
 
     def __str__(self):
-        msg = "[interakt-track] {0}: {1} ({2})"
+        msg = "[interakt-track] StatusCode({0}): {1} (Success={2})"
         return msg.format(self.code, self.message, self.status)