MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only log unexpected MRM retrieval errors

This commit is contained in:
Chris Eager 2025-02-14 13:11:40 -06:00 committed by Chris Eager
parent 6d30a45017
commit b203344ed4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
View File

@ -455,7 +455,6 @@ public class MessagesCache {
} }
}) })
.onErrorResume(throwable -> { .onErrorResume(throwable -> {
logger.warn("Failed to retrieve shared mrm data", throwable);
final List<Tag> tags = new ArrayList<>(); final List<Tag> tags = new ArrayList<>();
tags.add(Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(mrmMessage.getEphemeral()))); tags.add(Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(mrmMessage.getEphemeral())));
@ -467,6 +466,7 @@ public class MessagesCache {
// MRM data) fails after it has been delivered. We return it so that it may be discarded from the queue. // MRM data) fails after it has been delivered. We return it so that it may be discarded from the queue.
result = Mono.just(mrmMessage.toBuilder().setSharedMrmKey(STALE_MRM_KEY).build()); result = Mono.just(mrmMessage.toBuilder().setSharedMrmKey(STALE_MRM_KEY).build());
} else { } else {
logger.warn("Failed to retrieve shared mrm data", throwable);
// For unexpected errors, return empty. The message will remain in the queue and be retried in the future. // For unexpected errors, return empty. The message will remain in the queue and be retried in the future.
result = Mono.empty(); result = Mono.empty();
} }

5
service/src/main/java/org/whispersystems/textsecuregcm/storage/MrmDataMissingException.java
View File

@ -18,4 +18,9 @@ class MrmDataMissingException extends NoStackTraceRuntimeException {
Type getType() { Type getType() {
return type; return type;
} }
@Override
public String toString() {
return "MrmDataMissingException{type=%s}".formatted(type);
}
} }