Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Prune messages by cron if room not updated #15252

Merged
merged 9 commits into from
Sep 19, 2019
Merged

[FIX] Prune messages by cron if room not updated #15252

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a8f565
fix temporary my_message extra data
ggazzo Dec 11, 2018
bca9775
Merge remote-tracking branch 'origin/develop' into develop
ggazzo Dec 19, 2018
f134a12
Merge remote-tracking branch 'origin/develop' into develop
ggazzo Jan 3, 2019
587a3c5
Merge remote-tracking branch 'origin/develop' into develop
ggazzo Jan 24, 2019
ef2285a
fix part 1
ggazzo Jan 25, 2019
f74d92e
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
ggazzo Feb 5, 2019
67e91eb
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
ggazzo Aug 26, 2019
a9188db
fix done without performance tweaks
ggazzo Aug 26, 2019
614a51d
Apply suggestions from code review
sampaiodiego Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions app/retention-policy/server/cronPruneMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ let types = [];

const oldest = new Date('0001-01-01T00:00:00Z');

let lastPrune = oldest;

const maxTimes = {
c: 0,
p: 0,
d: 0,
};
const toDays = 1000 * 60 * 60 * 24;
const gracePeriod = 5000;

const toDays = (d) => d * 1000 * 60 * 60 * 24;

function job() {
const now = new Date();
const filesOnly = settings.get('RetentionPolicy_FilesOnly');
Expand All @@ -27,11 +27,11 @@ function job() {
// get all rooms with default values
types.forEach((type) => {
const maxAge = maxTimes[type] || 0;
const latest = new Date(now.getTime() - maxAge * toDays);
const latest = new Date(now.getTime() - toDays(maxAge));

Rooms.find({
t: type,
_updatedAt: { $gte: latest },
// _updatedAt: { $gte: latest },
sampaiodiego marked this conversation as resolved.
Show resolved Hide resolved
$or: [
{ 'retention.enabled': { $eq: true } },
{ 'retention.enabled': { $exists: false } },
Expand All @@ -46,25 +46,25 @@ function job() {
'retention.enabled': { $eq: true },
'retention.overrideGlobal': { $eq: true },
'retention.maxAge': { $gte: 0 },
_updatedAt: { $gte: lastPrune },
// _updatedAt: { $gte: lastPrune },
sampaiodiego marked this conversation as resolved.
Show resolved Hide resolved
}).forEach((room) => {
const { maxAge = 30, filesOnly, excludePinned } = room.retention;
const latest = new Date(now.getTime() - maxAge * toDays);
const latest = new Date(now.getTime() - toDays(maxAge));
cleanRoomHistory({ rid: room._id, latest, oldest, filesOnly, excludePinned, ignoreDiscussion });
});
lastPrune = new Date(now.getTime() - gracePeriod);
// lastPrune = new Date(now.getTime() - getGrace(settings.get('RetentionPolicy_Precision')));
sampaiodiego marked this conversation as resolved.
Show resolved Hide resolved
}

function getSchedule(precision) {
switch (precision) {
case '0':
return '0 */30 * * * *';
return '0 */30 * * * *'; // 30 minutes
case '1':
return '0 0 * * * *';
return '0 0 * * * *'; // hour
case '2':
return '0 0 */6 * * *';
return '0 0 */6 * * *'; // 6 hours
case '3':
return '0 0 0 * * *';
return '0 0 0 * * *'; // day
}
}

Expand All @@ -83,27 +83,28 @@ function deployCron(precision) {

function reloadPolicy() {
types = [];
// lastPrune = oldest;
sampaiodiego marked this conversation as resolved.
Show resolved Hide resolved

if (settings.get('RetentionPolicy_Enabled')) {
if (settings.get('RetentionPolicy_AppliesToChannels')) {
types.push('c');
}
if (!settings.get('RetentionPolicy_Enabled')) {
return SyncedCron.remove(pruneCronName);
}
if (settings.get('RetentionPolicy_AppliesToChannels')) {
types.push('c');
}

if (settings.get('RetentionPolicy_AppliesToGroups')) {
types.push('p');
}
if (settings.get('RetentionPolicy_AppliesToGroups')) {
types.push('p');
}

if (settings.get('RetentionPolicy_AppliesToDMs')) {
types.push('d');
}
if (settings.get('RetentionPolicy_AppliesToDMs')) {
types.push('d');
}

maxTimes.c = settings.get('RetentionPolicy_MaxAge_Channels');
maxTimes.p = settings.get('RetentionPolicy_MaxAge_Groups');
maxTimes.d = settings.get('RetentionPolicy_MaxAge_DMs');
maxTimes.c = settings.get('RetentionPolicy_MaxAge_Channels');
maxTimes.p = settings.get('RetentionPolicy_MaxAge_Groups');
maxTimes.d = settings.get('RetentionPolicy_MaxAge_DMs');

return deployCron(settings.get('RetentionPolicy_Precision'));
}
return SyncedCron.remove(pruneCronName);
return deployCron(settings.get('RetentionPolicy_Precision'));
}

Meteor.startup(function() {
Expand Down