4 files changed, 19 insertions, 20 deletions
diff --git a/python/client.py b/python/client.py
index a8a971be..551cd39d 100644
--- a/python/client.py
+++ b/python/client.py
@@ -1,15 +1,11 @@
 import logging
-import os
-import redis
-import socket
 import tasks
 
 from json import loads, dumps
 from db import dbconn
-from process_queue import get_redis_queue
+from common import get_redis_queue
 
 def run():
-    hostname = socket.gethostname()
     ET = dbconn('etdb')
     q = get_redis_queue()
     while True:
diff --git a/python/common.py b/python/common.py
index ce9c2fe1..05deab26 100644
--- a/python/common.py
+++ b/python/common.py
@@ -1,3 +1,6 @@
+import redis
+import logging
+
 def sanitize_float(intex_float):
     try:
         intex_float = intex_float.replace(",", "")
@@ -9,3 +12,15 @@ def sanitize_float(intex_float):
             return float(intex_float)
     except (AttributeError, ValueError):
         return intex_float
+
+def get_redis_queue():
+    q = redis.Redis(unix_socket_path='/run/redis/redis.sock')
+    try:
+        q.ping()
+    except redis.ConnectionError:
+        try:
+            q = redis.Redis(os.environ['REDIS_HOST'])
+        except KeyError:
+            logging.error("Please set redis host in REDIS_HOST")
+            sys.exit(1)
+    return q
diff --git a/python/process_queue.py b/python/process_queue.py
index 107f0b80..43d7d9a7 100644
--- a/python/process_queue.py
+++ b/python/process_queue.py
@@ -1,5 +1,4 @@
 import datetime
-import redis
 import socket
 import pandas as pd
 import csv
@@ -16,6 +15,7 @@ import task_server.config as config
 import os
 from sqlalchemy import create_engine
 from bbg_helpers import init_bbg_session, retrieve_data, BBG_IP
+from common import get_redis_queue
 import re
 from analytics.utils import previous_twentieth
 from db import dbconn
@@ -81,18 +81,6 @@ def decode_dict(d):
     return {k.decode() if isinstance(k, bytes) else k: \
             v.decode() if isinstance(v, bytes) else v for k, v in d.items()}
 
-def get_redis_queue():
-    q = redis.Redis(unix_socket_path='/run/redis/redis.sock')
-    try:
-        q.ping()
-    except redis.ConnectionError:
-        try:
-            q = redis.Redis(os.environ['REDIS_HOST'])
-        except KeyError:
-            logging.error("Please set redis host in REDIS_HOST")
-            sys.exit(1)
-    return q
-
 def get_effective_date(d):
     return previous_twentieth(d + datetime.timedelta(days=1))
 
diff --git a/python/task_runner.py b/python/task_runner.py
index 67f68edc..4809991a 100644
--- a/python/task_runner.py
+++ b/python/task_runner.py
@@ -1,11 +1,11 @@
 import logging
-import redis
 import tasks
+
 from systemd.daemon import notify
 from systemd import journal
 from json import loads, dumps
 from db import dbconn
-from process_queue import get_redis_queue
+from common import get_redis_queue
 
 def run():
     ET = dbconn('etdb')