Skip to content

Commit 5c639b3

Browse files
committed
correct error message
1 parent 38e9573 commit 5c639b3

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/iterative_telemetry/__init__.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,18 @@ def _find_or_create_user_id():
233233
):
234234
user_id = _read_user_id(config_file)
235235
if user_id is None:
236-
user_id = _read_user_id_locked(config_file_old)
236+
try:
237+
user_id = _read_user_id_locked(config_file_old)
238+
except Timeout:
239+
logger.debug(
240+
"Failed to acquire %s",
241+
config_file_old.with_suffix(".lock"),
242+
)
243+
return None
237244
if user_id is None:
238245
user_id = _generate_id()
239246
with config_file.open(mode="w", encoding="utf8") as fobj:
240247
json.dump({"user_id": user_id}, fobj)
241-
242-
if user_id.lower() != DO_NOT_TRACK_VALUE.lower():
243-
return user_id
244248
except Timeout:
245249
logger.debug("Failed to acquire %s", lockfile)
246-
return None
250+
return user_id if user_id.lower() != DO_NOT_TRACK_VALUE.lower() else None

0 commit comments

Comments
 (0)