Skip to content

Commit 7e5ab0a

Browse files
Added memory cache to /db-admin message-cache info
1 parent 21d7449 commit 7e5ab0a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/main/java/net/javadiscord/javabot/data/h2db/commands/message_cache/MessageCacheInfoSubcommand.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ public InteractionCallbackAction<InteractionHook> handleSlashCommandInteraction(
2323

2424
private MessageEmbed buildInfoEmbed(GuildConfig config, User author) {
2525
long messages = DbActions.count("SELECT count(*) FROM message_cache");
26-
int maxMessages = config.getMessageCache().getMaxCachedMessages();
26+
int maxDatabaseMessages = config.getMessageCache().getMaxCachedMessages();
27+
int maxMemoryMessages = config.getMessageCache().getMessageSynchronizationInterval();
2728
return new EmbedBuilder()
2829
.setAuthor(author.getAsTag(), null, author.getEffectiveAvatarUrl())
2930
.setTitle("Message Cache Info")
3031
.setColor(config.getSlashCommand().getDefaultColor())
3132
.addField("Table Size", DbActions.getLogicalSize("message_cache") + " bytes", true)
32-
.addField("Cached Messages", String.format("%s/%s (%s%%)", messages, maxMessages, ((float) messages / maxMessages) * 100), true)
33+
.addField("Cached (Memory)", String.format("%s/%s (%.2f%%)", Bot.messageCache.cache.size(), maxMemoryMessages, ((float) Bot.messageCache.cache.size() / maxMemoryMessages) * 100), false)
34+
.addField("Cached (Database)", String.format("%s/%s (%.2f%%)", messages, maxDatabaseMessages, ((float) messages / maxDatabaseMessages) * 100), true)
3335
.build();
3436
}
3537
}

src/main/java/net/javadiscord/javabot/data/h2db/message_cache/MessageCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
@Slf4j
3838
public class MessageCache {
39-
List<CachedMessage> cache = new ArrayList<>();
39+
public List<CachedMessage> cache = new ArrayList<>();
4040
/**
4141
* Amount of messages since the last synchronization.
4242
* <p>

0 commit comments

Comments
 (0)