Fix semaphore usage

The semaphore should be passing the blocking argument to the
underlying lock that is used (so it is non-blocking as well) and
it should also be passing the timeout as well.

The non-blocking result should also not add a watch that will
later attempt to get the least (another call to acquire should be
used instead, or the blocking mode should be used instead).

Author: Joshua Harlow

kazoo/recipe/lock.py

@@ -448,7 +448,11 @@ def _inner_acquire(self, blocking, timeout=None):
         if self.client.exists(self.create_path):
             return True
 
-        with self.client.Lock(self.lock_path, self.data):
+        lock = self.client.Lock(self.lock_path, self.data)
+        gotten = lock.acquire(blocking=blocking, timeout=timeout)
+        if not gotten:
+            return False
+        try:
             while True:
                 self.wake_event.clear()
 
@@ -465,10 +469,9 @@ def _inner_acquire(self, blocking, timeout=None):
                             "Failed to acquire semaphore on %s "
                             "after %s seconds" % (self.path, timeout))
                 else:
-                    # If not blocking, register another watch that will trigger
-                    # self._get_lease() as soon as the children change again.
-                    self.client.get_children(self.path, self._get_lease)
                     return False
+        finally:
+            lock.release()
 
     def _watch_lease_change(self, event):
         self.wake_event.set()