Refactor sleeper duplications

lib/galaxy/jobs/deferred/__init__.py

@@ -8,6 +8,7 @@
 
 from galaxy import model
 from galaxy.util.bunch import Bunch
+from galaxy.util.sleeper import Sleeper
 
 log = logging.getLogger( __name__ )
 
@@ -148,25 +149,6 @@ def shutdown( self ):
         self.sleeper.wake()
 
 
-class Sleeper( object ):
-    """
-    Provides a 'sleep' method that sleeps for a number of seconds *unless*
-    the notify method is called (from a different thread).
-    """
-    def __init__( self ):
-        self.condition = threading.Condition()
-
-    def sleep( self, seconds ):
-        self.condition.acquire()
-        self.condition.wait( seconds )
-        self.condition.release()
-
-    def wake( self ):
-        self.condition.acquire()
-        self.condition.notify()
-        self.condition.release()
-
-
 class FakeTrans( object ):
     """A fake trans for calling the external set metadata tool"""
     def __init__( self, app, history=None, user=None):

lib/galaxy/jobs/transfer_manager.py

@@ -8,7 +8,7 @@
 import socket
 import threading
 
-from galaxy.util import listify, json
+from galaxy.util import listify, json, sleeper
 
 log = logging.getLogger( __name__ )
 
@@ -24,7 +24,7 @@ def __init__( self, app ):
         if app.config.get_bool( 'enable_job_recovery', True ):
             # Only one Galaxy server process should be able to recover jobs! (otherwise you'll have nasty race conditions)
             self.running = True
-            self.sleeper = Sleeper()
+            self.sleeper = sleeper.Sleeper()
             self.restarter = threading.Thread( target=self.__restarter )
             self.restarter.start()
 
@@ -155,22 +155,3 @@ def __restarter( self ):
     def shutdown( self ):
         self.running = False
         self.sleeper.wake()
-
-
-class Sleeper( object ):
-    """
-    Provides a 'sleep' method that sleeps for a number of seconds *unless*
-    the notify method is called (from a different thread).
-    """
-    def __init__( self ):
-        self.condition = threading.Condition()
-
-    def sleep( self, seconds ):
-        self.condition.acquire()
-        self.condition.wait( seconds )
-        self.condition.release()
-
-    def wake( self ):
-        self.condition.acquire()
-        self.condition.notify()
-        self.condition.release()