Skip to content

Fix typo of Math.pow, ^ -> ** #18543

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
anoadragon453 merged 6 commits into from
Jun 13, 2025
Merged

Fix typo of Math.pow, ^ -> ** #18543

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bde4ffc
Fix typo of Math.pow, `^` -> `**`
anoadragon453 Jun 12, 2025
4d42e03
newsfile
anoadragon453 Jun 12, 2025
112f62c
Switch conditional to be based on minutes
anoadragon453 Jun 12, 2025
fe42bf3
Deduplicate time constants
anoadragon453 Jun 12, 2025
1c1c928
Merge branch 'develop' of github.com:element-hq/synapse into anoa/pow…
anoadragon453 Jun 13, 2025
ead1f8c
Remove f-strings from log-line
anoadragon453 Jun 13, 2025
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
1 change: 1 addition & 0 deletions changelog.d/18543.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix an issue where "Lock timeout is getting excessive" warnings would be logged even when the lock timeout was <10 minutes.
4 changes: 2 additions & 2 deletions synapse/handlers/worker_lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ async def __aexit__(
def _get_next_retry_interval(self) -> float:
next = self._retry_interval
self._retry_interval = max(5, next * 2)
if self._retry_interval > 5 * 2 ^ 7: # ~10 minutes
if self._retry_interval > 5 * 2**7: # ~10 minutes
Comment thread
MadLittleMods marked this conversation as resolved.
Outdated
logging.warning(
f"Lock timeout is getting excessive: {self._retry_interval}s. There may be a deadlock."
)
Expand Down Expand Up @@ -349,7 +349,7 @@ async def __aexit__(
def _get_next_retry_interval(self) -> float:
next = self._retry_interval
self._retry_interval = max(5, next * 2)
if self._retry_interval > 5 * 2 ^ 7: # ~10 minutes
if self._retry_interval > 5 * 2**7: # ~10 minutes
logging.warning(
f"Lock timeout is getting excessive: {self._retry_interval}s. There may be a deadlock."
)
Expand Down
Loading
⚡