Skip to content

Commit

Permalink
Improve exception logging in NextId and Redlock (#294)
Browse files Browse the repository at this point in the history
  • Loading branch information
brainix committed Dec 14, 2020
1 parent 82f6061 commit 41f3505
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
12 changes: 10 additions & 2 deletions pottery/nextid.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ def __current_id(self) -> int:
try:
current_id = int(future.result())
except RedisError as error:
_logger.error(error, exc_info=True)
_logger.exception(
'%s.__current_id() getter caught an %s',
self.__class__.__name__,
error.__class__.__name__,
)
else:
current_ids.append(current_id)

Expand Down Expand Up @@ -175,7 +179,11 @@ def __current_id(self, value: int) -> None:
try:
num_masters_set += future.result() == value
except RedisError as error:
_logger.error(error, exc_info=True)
_logger.exception(
'%s.__current_id() setter caught an %s',
self.__class__.__name__,
error.__class__.__name__,
)
else:
quorum = num_masters_set >= len(self.masters) // 2 + 1
if quorum: # pragma: no cover
Expand Down
24 changes: 20 additions & 4 deletions pottery/redlock.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,11 @@ def __acquire_masters(self) -> bool:
try:
num_masters_acquired += future.result()
except RedisError as error: # pragma: no cover
_logger.error(error, exc_info=True)
_logger.exception(
'%s.__acquire_masters() caught an %s',
self.__class__.__name__,
error.__class__.__name__,
)
else:
quorum = num_masters_acquired >= len(self.masters) // 2 + 1
if quorum:
Expand Down Expand Up @@ -373,7 +377,11 @@ def locked(self) -> int:
try:
ttls.append(future.result())
except RedisError as error: # pragma: no cover
_logger.error(error, exc_info=True)
_logger.exception(
'%s.locked() caught an %s',
self.__class__.__name__,
error.__class__.__name__,
)

num_masters_acquired = sum(1 for ttl in ttls if ttl > 0)
quorum = num_masters_acquired >= len(self.masters) // 2 + 1
Expand Down Expand Up @@ -421,7 +429,11 @@ def extend(self) -> None:
try:
num_masters_extended += future.result()
except RedisError as error: # pragma: no cover
_logger.error(error, exc_info=True)
_logger.exception(
'%s.extend() caught an %s',
self.__class__.__name__,
error.__class__.__name__,
)
else:
quorum = num_masters_extended >= len(self.masters) // 2 + 1
if quorum:
Expand Down Expand Up @@ -460,7 +472,11 @@ def release(self) -> None:
try:
num_masters_released += future.result()
except RedisError as error: # pragma: no cover
_logger.error(error, exc_info=True)
_logger.exception(
'%s.release() caught an %s',
self.__class__.__name__,
error.__class__.__name__,
)
else:
quorum = num_masters_released >= len(self.masters) // 2 + 1
if quorum:
Expand Down

0 comments on commit 41f3505

Please sign in to comment.