added logging to several places concerning futures

This commit is contained in:
Sheldan
2020-05-01 22:56:21 +02:00
parent f2ce402256
commit 70365ca556
9 changed files with 68 additions and 10 deletions

View File

@@ -35,7 +35,12 @@ public class MessageDeletedListenerBean extends ListenerAdapter {
@Transactional
public void onGuildMessageDelete(@Nonnull GuildMessageDeleteEvent event) {
Consumer<CachedMessage> cachedMessageConsumer = cachedMessage -> self.executeListener(cachedMessage);
messageCache.getMessageFromCache(event.getGuild().getIdLong(), event.getChannel().getIdLong(), event.getMessageIdLong()).thenAccept(cachedMessageConsumer);
messageCache.getMessageFromCache(event.getGuild().getIdLong(), event.getChannel().getIdLong(), event.getMessageIdLong())
.thenAccept(cachedMessageConsumer)
.exceptionally(throwable -> {
log.error("Message retrieval {} from cache failed. ", event.getMessageIdLong(), throwable);
return null;
});
}
@Transactional

View File

@@ -38,6 +38,9 @@ public class MessageUpdatedListener extends ListenerAdapter {
messageCache.getMessageFromCache(message.getGuild().getIdLong(), message.getTextChannel().getIdLong(), event.getMessageIdLong()).thenAccept(cachedMessage -> {
self.executeListener(message, cachedMessage);
messageCache.putMessageInCache(message);
}).exceptionally(throwable -> {
log.error("Message retrieval {} from cache failed. ", event.getMessage().getId(), throwable);
return null;
});
}

View File

@@ -63,7 +63,13 @@ public class ReactionUpdatedListener extends ListenerAdapter {
future.thenAccept(reaction -> {
self.callAddedListeners(event, cachedMessage, reaction);
messageCache.putMessageInCache(cachedMessage);
}).exceptionally(throwable -> {
log.error("Failed to add reaction to message {} ", event.getMessageIdLong(), throwable);
return null;
});
}).exceptionally(throwable -> {
log.error("Message retrieval {} from cache failed. ", event.getMessageIdLong(), throwable);
return null;
});
}
@@ -122,9 +128,15 @@ public class ReactionUpdatedListener extends ListenerAdapter {
messageCache.getCachedReactionFromReaction(future, event.getReaction());
future.thenAccept(reaction ->
self.callRemoveListeners(event, cachedMessage, reaction)
);
) .exceptionally(throwable -> {
log.error("Failed to retrieve cached reaction for message {} ", event.getMessageIdLong(), throwable);
return null;
});
messageCache.putMessageInCache(cachedMessage);
}).exceptionally(throwable -> {
log.error("Message retrieval {} from cache failed. ", event.getMessageIdLong(), throwable);
return null;
});
}
@@ -152,6 +164,9 @@ public class ReactionUpdatedListener extends ListenerAdapter {
asyncMessageFromCache.thenAccept(cachedMessage -> {
cachedMessage.getReactions().clear();
messageCache.putMessageInCache(cachedMessage);
}) .exceptionally(throwable -> {
log.error("Message retrieval from cache failed for message {}", event.getMessageIdLong(), throwable);
return null;
});
}

View File

@@ -127,7 +127,10 @@ public class MessageCacheBean implements MessageCache {
.timeCreated(Instant.from(message.getTimeCreated()))
.attachmentUrls(attachmentUrls)
.build())
);
).exceptionally(throwable -> {
log.error("Failed to load reactions for message {}. ", message.getId(), throwable);
return null;
});
}
private List<CachedReaction> getFutures(List<CompletableFuture<CachedReaction>> futures) {
@@ -153,7 +156,11 @@ public class MessageCacheBean implements MessageCache {
users.forEachAsync(user -> {
ausers.add(AUser.builder().id(user.getIdLong()).build());
return false;
}).thenAccept(o -> future.complete(builder.build()));
}).thenAccept(o -> future.complete(builder.build()))
.exceptionally(throwable -> {
log.error("Failed to load reaction users.", throwable);
return null;
});
builder.users(ausers);
builder.emote(emoteService.buildAEmoteFromReaction(reaction.getReactionEmote()));
}

View File

@@ -118,10 +118,16 @@ public class PostTargetServiceBean implements PostTargetService {
.queue(
existingMessage -> existingMessage
.editMessage(messageToSend.getEmbeds().get(0))
.submit().thenAccept(message -> future.get(0).complete(message)),
.submit().thenAccept(message -> future.get(0).complete(message)).exceptionally(throwable -> {
log.error("Failed to edit message {}.", messageId, throwable);
return null;
}),
throwable ->
sendEmbedInPostTarget(messageToSend, target).get(0)
.thenAccept(message -> future.get(0).complete(message))
.thenAccept(message -> future.get(0).complete(message)) .exceptionally(innerThrowable -> {
log.error("Failed to send message to create a message.", innerThrowable);
return null;
})
);
} else {
textChannelForPostTarget
@@ -130,10 +136,16 @@ public class PostTargetServiceBean implements PostTargetService {
existingMessage -> existingMessage
.editMessage(messageToSend.getMessage())
.embed(messageToSend.getEmbeds().get(0))
.submit().thenAccept(message -> future.get(0).complete(message)),
.submit().thenAccept(message -> future.get(0).complete(message)).exceptionally(throwable -> {
log.error("Failed to edit message {}", messageId, throwable);
return null;
}),
throwable ->
sendEmbedInPostTarget(messageToSend, target).get(0)
.thenAccept(message -> future.get(0).complete(message))
.thenAccept(message -> future.get(0).complete(message)).exceptionally(innerThrowable -> {
log.error("Failed to send message to create a message.", innerThrowable);
return null;
})
);
}
}