Skip to content

Don't prune messages inside dispatch script FMSG-61 #resolve #104

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

Merged
merged 1 commit into from
Sep 17, 2020
Merged

Don't prune messages inside dispatch script FMSG-61 #resolve #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 12 additions & 29 deletions messaging-core/src/main/java/org/fenixedu/messaging/core/task/MessageTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,27 @@
import org.fenixedu.messaging.core.domain.Message;
import org.fenixedu.messaging.core.domain.MessageDispatchReport;
import org.fenixedu.messaging.core.domain.MessagingSystem;
import org.fenixedu.messaging.core.domain.Sender;

import java.util.HashSet;
import java.util.Set;

@Task(englishTitle = "Message Task", readOnly = true)
public class MessageTask extends CronTask {
@Override
public void runTask() {
Set<Sender> sendersFromMessages = new HashSet<>();
int dispatched = 0;
for (final Message message : MessagingSystem.getPendingMessages()) {
long start = System.currentTimeMillis();
MessageDispatchReport report = MessagingSystem.dispatch(message);
if (report != null) {
getLogger().info("Dispatched message: {} in {}ms for {} addresses", message.getExternalId(), System
.currentTimeMillis() - start, report.getTotalCount());
dispatched++;
sendersFromMessages.add(message.getSender());
}
}
final long dispatched = MessagingSystem.getPendingMessages().stream()
.mapToLong(this::dispatch)
.count();
if (dispatched > 0) {
taskLog("Dispatched %d messages\n", dispatched);
}
}

taskLog("%d possible senders to prune%n", sendersFromMessages.size());
int pruned = 0;
for (Sender sender : sendersFromMessages){
int diff = sender.getMessageSet().size();
sender.pruneMessages();
diff = diff - sender.getMessageSet().size();
if (diff > 0) {
getLogger().info("Pruned sender: {} for {} messages", sender.getExternalId(), diff);
pruned += diff;
}
}
if (pruned > 0) {
taskLog("Pruned %d messages\n", pruned);
private long dispatch(final Message message) {
final long start = System.currentTimeMillis();
final MessageDispatchReport report = MessagingSystem.dispatch(message);
if (report != null) {
getLogger().info("Dispatched message: {} in {}ms for {} addresses", message.getExternalId(), System
.currentTimeMillis() - start, report.getTotalCount());
return 1;
}
return 0;
}
}