From b7ecea93233f538198acfc40fd2efdb772577bac Mon Sep 17 00:00:00 2001 From: Clint Armstrong Date: Wed, 2 Sep 2015 14:42:57 -0400 Subject: [PATCH] make sure to clear the thread if unsuccessful --- poller-service.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/poller-service.py b/poller-service.py index 9ebbb46b9..ccab47f48 100755 --- a/poller-service.py +++ b/poller-service.py @@ -200,7 +200,10 @@ def getThreadQueueLock(device_id): for thread_cursor in thread_cursors: if not thread_cursor.in_use: thread_cursor.in_use = 'queue.{0}'.format(device_id) - return getLock('queue.{0}'.format(device_id), thread_cursor.cursor) + if getLock('queue.{0}'.format(device_id), thread_cursor.cursor): + return True + else: + thread_cursor.in_use = False time.sleep(.5) @@ -210,7 +213,10 @@ def getThreadActionLock(device_id, action): for thread_cursor in thread_cursors: if thread_cursor.in_use == 'queue.{0}'.format(device_id): thread_cursor.in_use = '{0}.{1}'.format(action, device_id) - return getLock('{0}.{1}'.format(action, device_id), thread_cursor.cursor) + if getLock('{0}.{1}'.format(action, device_id), thread_cursor.cursor): + return True + else: + thread_cursor.in_use = False return False