backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log failed remote resident server join requests

Browse source
This commit is contained in:
Andreas Fuchs 2024-10-13 19:24:41 -07:00 • committed by Charles Hall
parent e001356653
commit 76a633cb66
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
book/changelog.md
View file

@ -107,7 +107,8 @@ This will be the first release of Grapevine since it was forked from Conduit
[!54](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/54), [!54](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/54),
[!56](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/56), [!56](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/56),
[!69](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/69), [!69](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/69),
[!102](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/102)) [!102](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/102),
[!127](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/127))
5. Stop returning unnecessary member counts from `/_matrix/client/{r0,v3}/sync`. 5. Stop returning unnecessary member counts from `/_matrix/client/{r0,v3}/sync`.
([!12](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/12)) ([!12](https://gitlab.computer.surgery/matrix/grapevine/-/merge_requests/12))
6. **BREAKING:** Allow federation by default. 6. **BREAKING:** Allow federation by default.

17
src/api/client_server/membership.rs
View file

@ -1158,11 +1158,18 @@ async fn make_join_request(
) )
.await; .await;
make_join_response_and_server = match make_join_response {
make_join_response.map(|r| (r, remote_server.clone())); Ok(r) => {
return Ok((r, remote_server.clone()));
if make_join_response_and_server.is_ok() { }
break; Err(error) => {
warn!(
%error,
server = %remote_server,
"Remote join request failed",
);
make_join_response_and_server = Err(error);
}
} }
} }