Skip to content

Replace lockfile context mgr usage with lock.aquire() and lock.release() #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2016
Merged

Replace lockfile context mgr usage with lock.aquire() and lock.release() #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
441ce6b
Replace lockfile context mgr usage with lock.aquire() and lock.release()
PrzemekWirkus Jul 19, 2016
b772236
Reduced timeout for mock file Locking to 0.5 seconds
PrzemekWirkus Jul 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions mbed_lstools/lstools_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import lockfile
from os import listdir
from os.path import isfile, join
from lockfile import LockFailed
from lockfile import LockFailed, LockTimeout

class MbedLsToolsBase:
""" Base class for mbed-lstools, defines mbed-ls tools interface for mbed-enabled devices detection for various hosts
Expand Down Expand Up @@ -252,16 +252,21 @@ def read_mock_file(filename):
return {}

try:
with self.mbedls_get_global_lock():
lock = self.mbedls_get_global_lock()
if lock.acquire(timeout=0.5):
# This read is for backward compatibility
# When user already have on its system local mock-up it will work
# overwriting global one
if isfile(self.MOCK_FILE_NAME):
return read_mock_file(self.MOCK_FILE_NAME)
ret = read_mock_file(self.MOCK_FILE_NAME)
lock.release()
return ret

if isfile(self.MOCK_HOME_FILE_NAME):
return read_mock_file(self.MOCK_HOME_FILE_NAME)
except LockFailed as e:
ret = read_mock_file(self.MOCK_HOME_FILE_NAME)
lock.release()
return ret
except (LockFailed, LockTimeout) as e:
self.err(str(e))
return {}

Expand All @@ -284,9 +289,12 @@ def write_mock_file(filename, mock_ids):
return False

try:
with self.mbedls_get_global_lock():
return write_mock_file(self.MOCK_HOME_FILE_NAME, mock_ids)
except LockFailed as e:
lock = self.mbedls_get_global_lock()
if lock.acquire(timeout=0.5):
ret = write_mock_file(self.MOCK_HOME_FILE_NAME, mock_ids)
lock.release()
return ret
except (LockFailed, LockTimeout) as e:
self.err(str(e))
return False

Expand Down