StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do saved message clean-up globally, not per-guild

Browse source 
Possible fix for the DEADLOCK errors on the server, and should also be
more performant (though probably marginally).
This commit is contained in:
Dragory 2019-04-20 19:51:26 +03:00
parent d7079df83d
commit d30fbbbbaa
1 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/data/GuildSavedMessages.ts
View file

@ -5,10 +5,37 @@ import { QueuedEventEmitter } from "../QueuedEventEmitter";
import { GuildChannel, Message } from "eris"; import { GuildChannel, Message } from "eris";
import moment from "moment-timezone"; import moment from "moment-timezone";
const CLEANUP_INTERVAL = 5 * 60 * 1000; const CLEANUP_INTERVAL = 5 * 60 * 1000; // 5 min
const RETENTION_PERIOD = 5 * 24 * 60 * 60 * 1000; // 5 days const RETENTION_PERIOD = 5 * 24 * 60 * 60 * 1000; // 5 days
async function cleanup() {
const repository = getRepository(SavedMessage);
await repository
.createQueryBuilder("messages")
.where(
// Clear deleted messages
new Brackets(qb => {
qb.where("deleted_at IS NOT NULL");
qb.andWhere(`deleted_at <= (NOW() - INTERVAL ${CLEANUP_INTERVAL}000 MICROSECOND)`);
}),
)
.orWhere(
// Clear old messages
new Brackets(qb => {
qb.where("is_permanent = 0");
qb.andWhere(`posted_at <= (NOW() - INTERVAL ${RETENTION_PERIOD}000 MICROSECOND)`);
}),
)
.delete()
.execute();
setTimeout(cleanup, CLEANUP_INTERVAL);
}
// Start first cleanup 30 seconds after startup
setTimeout(cleanup, 30 * 1000);
export class GuildSavedMessages extends BaseRepository { export class GuildSavedMessages extends BaseRepository {
private messages: Repository<SavedMessage>; private messages: Repository<SavedMessage>;
protected toBePermanent: Set<string>; protected toBePermanent: Set<string>;
@ -21,9 +48,6 @@ export class GuildSavedMessages extends BaseRepository {
this.events = new QueuedEventEmitter(); this.events = new QueuedEventEmitter();
this.toBePermanent = new Set(); this.toBePermanent = new Set();
this.cleanup();
setInterval(() => this.cleanup(), CLEANUP_INTERVAL);
} }
public msgToSavedMessageData(msg: Message): ISavedMessageData { public msgToSavedMessageData(msg: Message): ISavedMessageData {
@ -42,33 +66,6 @@ export class GuildSavedMessages extends BaseRepository {
return data; return data;
} }
async cleanup() {
await this.messages
.createQueryBuilder("messages")
.where("guild_id = :guild_id", { guild_id: this.guildId })
.andWhere(
new Brackets(qb => {
// Clear deleted messages
qb.orWhere(
new Brackets(qb2 => {
qb2.where("deleted_at IS NOT NULL");
qb2.andWhere(`deleted_at <= (NOW() - INTERVAL ${CLEANUP_INTERVAL}000 MICROSECOND)`);
}),
);
// Clear old messages
qb.orWhere(
new Brackets(qb2 => {
qb2.where("is_permanent = 0");
qb2.andWhere(`posted_at <= (NOW() - INTERVAL ${RETENTION_PERIOD}000 MICROSECOND)`);
}),
);
}),
)
.delete()
.execute();
}
find(id) { find(id) {
return this.messages return this.messages
.createQueryBuilder() .createQueryBuilder()