Use closing consistently.

awx/main/management/commands/run_callback_receiver.py

@@ -9,6 +9,7 @@ import logging
 import json
 import signal
 import time
+from contextlib import closing
 from optparse import make_option
 from multiprocessing import Process, Queue
 
@@ -90,12 +91,12 @@ class CallbackReceiver(object):
             time.sleep(0.1)
 
     def callback_handler(self, use_workers, worker_queues):
-        pubsub = PubSub('callbacks')
         message_number = 0
         total_messages = 0
         last_parent_events = {}
 
-        for message in pubsub.subscribe():
+        with closing(PubSub('callbacks')) as callbacks:
+            for message in callbacks.subscribe(wait=0.1):
                 total_messages += 1
                 if not use_workers:
                     self.process_job_event(message)

awx/main/queue.py

@@ -74,7 +74,7 @@ class PubSub(object):
         Ideally this should be used with `contextmanager.closing` to ensure
         well-behavedness:
 
-            from contextmanager import closing
+            from contextlib import closing
 
             with closing(PubSub('foobar')) as foobar:
                 for message in foobar.subscribe(wait=0.1):

awx/plugins/callback/job_event_callback.py

@@ -38,6 +38,7 @@ import sys
 import urllib
 import urlparse
 import time
+from contextlib import closing
 
 # Requests
 import requests
@@ -125,8 +126,8 @@ class CallbackModule(object):
                     self.connection_pid = active_pid
 
                 # Publish the callback through Redis.
-                pubsub = PubSub('callbacks')
-                pubsub.publish(msg)
+                with closing(PubSub('callbacks')) as callbacks:
+                    callbacks.publish(msg)
                 return
             except Exception, e:
                 self.logger.info('Publish Exception: %r, retry=%d', e,