Merge pull request #6344 from chrismeyersfsu/redis-cleanup1

Redis cleanup1

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx/main/dispatch/__init__.py

@@ -1,7 +1,5 @@
 import psycopg2
 import select
-import sys
-import logging
 
 from contextlib import contextmanager
 
@@ -9,10 +7,6 @@ from django.conf import settings
 
 
 NOT_READY = ([], [], [])
-if 'run_callback_receiver' in sys.argv:
-    logger = logging.getLogger('awx.main.commands.run_callback_receiver')
-else:
-    logger = logging.getLogger('awx.main.dispatch')
 
 
 def get_local_queuename():
@@ -36,25 +30,6 @@ class PubSub(object):
         with self.conn.cursor() as cur:
             cur.execute('SELECT pg_notify(%s, %s);', (channel, payload))
 
-    def get_event(self, select_timeout=0):
-        # poll the connection, then return one event, if we have one.  Else
-        # return None.
-        select.select([self.conn], [], [], select_timeout)
-        self.conn.poll()
-        if self.conn.notifies:
-            return self.conn.notifies.pop(0)
-
-    def get_events(self, select_timeout=0):
-        # Poll the connection and return all events, if there are any.  Else
-        # return None.
-        select.select([self.conn], [], [], select_timeout) # redundant?
-        self.conn.poll()
-        events = []
-        while self.conn.notifies:
-            events.append(self.conn.notifies.pop(0))
-        if events:
-            return events
-
     def events(self, select_timeout=5, yield_timeouts=False):
         while True:
             if select.select([self.conn], [], [], select_timeout) == NOT_READY: