Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
861d663c
Commit
861d663c
authored
5 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Fixup changelog and remove debug logging
parent
1771f004
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changelog.d/5850.feature
+1
-0
1 addition, 0 deletions
changelog.d/5850.feature
changelog.d/5850.misc
+0
-1
0 additions, 1 deletion
changelog.d/5850.misc
synapse/http/federation/well_known_resolver.py
+1
-4
1 addition, 4 deletions
synapse/http/federation/well_known_resolver.py
with
2 additions
and
5 deletions
changelog.d/5850.feature
0 → 100644
+
1
−
0
View file @
861d663c
Add
retry
to
well-known
lookups
if
we
have
recently
seen
a
valid well-known record for the server.
This diff is collapsed.
Click to expand it.
changelog.d/5850.misc
deleted
100644 → 0
+
0
−
1
View file @
1771f004
Retry well-known lookups if we have recently seen a valid well-known record for the server.
This diff is collapsed.
Click to expand it.
synapse/http/federation/well_known_resolver.py
+
1
−
4
View file @
861d663c
...
...
@@ -163,9 +163,7 @@ class WellKnownResolver(object):
Deferred[Tuple[bytes,int]]: The lookup result and cache period.
"""
had_valid_well_known
=
bool
(
self
.
_had_valid_well_known_cache
.
get
(
server_name
,
False
)
)
had_valid_well_known
=
self
.
_had_valid_well_known_cache
.
get
(
server_name
,
False
)
# We do this in two steps to differentiate between possibly transient
# errors (e.g. can't connect to host, 503 response) and more permenant
...
...
@@ -247,7 +245,6 @@ class WellKnownResolver(object):
# Bail if we've been cancelled
raise
except
Exception
as
e
:
logger
.
info
(
"
Retry: %s
"
,
retry
)
if
not
retry
or
i
>=
WELL_KNOWN_RETRY_ATTEMPTS
:
logger
.
info
(
"
Error fetching %s: %s
"
,
uri_str
,
e
)
raise
_FetchWellKnownFailure
(
temporary
=
True
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment