提交 be5e95e9 authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Made message about existing lock easier to understand

上级 2bbe3bb8
...@@ -150,6 +150,10 @@ def lock(tmp_dir, timeout=120, min_wait=5, max_wait=10, verbosity=1): ...@@ -150,6 +150,10 @@ def lock(tmp_dir, timeout=120, min_wait=5, max_wait=10, verbosity=1):
while os.path.isdir(tmp_dir): while os.path.isdir(tmp_dir):
try: try:
read_owner = open(lock_file).readlines()[0].strip() read_owner = open(lock_file).readlines()[0].strip()
# The following line does nothing but raise an exception
# if somehow something is wrong in the owner format, to
# avoid crashing later on.
read_owner.split('_')[0]
except: except:
read_owner = 'failure' read_owner = 'failure'
if last_owner == read_owner: if last_owner == read_owner:
...@@ -163,8 +167,12 @@ def lock(tmp_dir, timeout=120, min_wait=5, max_wait=10, verbosity=1): ...@@ -163,8 +167,12 @@ def lock(tmp_dir, timeout=120, min_wait=5, max_wait=10, verbosity=1):
time_start = time.time() time_start = time.time()
no_display = (verbosity == 0) no_display = (verbosity == 0)
if not no_display: if not no_display:
info("Waiting for existing lock by process '%s' (I am " if read_owner == 'failure':
"process '%s')" % (read_owner, my_pid)) msg = 'unknown process'
else:
msg = "process '%s'" % read_owner.split('_')[0]
info("Waiting for existing lock by %s (I am "
"process '%s')" % (msg, my_pid))
info("To manually release the lock, delete", tmp_dir) info("To manually release the lock, delete", tmp_dir)
if verbosity <= 1: if verbosity <= 1:
no_display = True no_display = True
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论