Skip to content
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

Jump to bottom

Nexus - Only set ahaready when ahasvcname is set. (SYN-3743) #2723

Merged
merged 4 commits into from Jun 17, 2022
Merged

Nexus - Only set ahaready when ahasvcname is set. (SYN-3743) #2723

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b216f9
Add additional aha logging (SYN-3744)
vEpiphyte Jun 17, 2022
be2ad94
Nexus - Only set ahaready when ahasvcname is set. (SYN-3743)
vEpiphyte Jun 17, 2022
a868af2
Revert "Add additional aha logging (SYN-3744)"
vEpiphyte Jun 17, 2022
314a283
Merge branch 'master' into bug_nexus_tellready
invisig0th Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion synapse/lib/nexus.py
View file
Open in desktop
Expand Up @@ -509,7 +509,7 @@ async def _tellAhaReady(self, status):
await self.cell.ahaclient.waitready(timeout=5)
ahainfo = await self.cell.ahaclient.getCellInfo()
ahavers = ahainfo['synapse']['version']
if ahavers >= (2, 95, 0):
if self.cell.ahasvcname is not None and ahavers >= (2, 95, 0):
await self.cell.ahaclient.modAhaSvcInfo(self.cell.ahasvcname, {'ready': True})

except asyncio.CancelledError: # pragma: no cover TODO: remove once >= py 3.8 only
Expand Down