PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-02-20 23:23:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

A Bad Filter (#763)

Browse source 
* comment out most of apply-cooldown-to... filter to find out which part of it causes issues with the PR

* fixed resource silo tests

* everything but starting the scheduled task

* shutdown now

* cleaning schedule managed by simple time check
This commit is contained in:
Fate-JH 2021-04-15 08:38:31 -04:00 • committed by GitHub
parent 8c34a55530
commit f5ef0a9674
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

44
server/src/main/java/net/psforever/filters/ApplyCooldownToDuplicateLoggingFilter.java
View file

@ -8,9 +8,6 @@ import ch.qos.logback.core.spi.FilterReply;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/**
* Disrupts a variety of logging messages that would otherwise repeat within a certain frame of time.
@ -21,9 +18,9 @@ import java.util.concurrent.TimeUnit;
*/
public class ApplyCooldownToDuplicateLoggingFilter extends Filter<ILoggingEvent> {
private long cooldown;
private ConcurrentHashMap<String, Long> messageMap;
private long cleaning = 900000L; //default: 15min
private ScheduledExecutorService housecleaning;
private ConcurrentHashMap<String, Long> messageMap;
private long housecleaningTime = System.currentTimeMillis() + cleaning;
@Override
public FilterReply decide(ILoggingEvent event) {
@ -33,43 +30,36 @@ public class ApplyCooldownToDuplicateLoggingFilter extends Filter<ILoggingEvent>
if (previousTime != null && previousTime + cooldown > currTime) {
return FilterReply.DENY;
} else {
if (currTime > housecleaningTime) {
runCleaning();
housecleaningTime = currTime + cleaning;
}
return FilterReply.NEUTRAL;
}
}
public void setCooldown(Long duration) {
this.cooldown = duration;
cooldown = duration;
}
public void setCleaning(Long duration) {
this.cleaning = duration;
cleaning = duration;
housecleaningTime = System.currentTimeMillis() + cleaning;
}
@Override
public void start() {
if (this.cooldown != 0L) {
messageMap = new ConcurrentHashMap<>(1000);
housecleaning = Executors.newScheduledThreadPool(1);
Runnable task = () -> {
//being "concurrent" should be enough
//the worst that can happen is two of the same message back-to-back in the log once in a while
if (!messageMap.isEmpty()) {
long currTime = System.currentTimeMillis();
Iterator<String> oldLogMessages = messageMap.entrySet().stream()
.filter( entry -> entry.getValue() + cooldown < currTime )
.map( Map.Entry::getKey )
.iterator();
oldLogMessages.forEachRemaining(key -> messageMap.remove(key));
}
};
housecleaning.scheduleWithFixedDelay(task, cleaning, cleaning, TimeUnit.MILLISECONDS);
super.start();
private void runCleaning() {
if (!messageMap.isEmpty()) {
long currTime = System.currentTimeMillis();
Iterator<String> oldLogMessages = messageMap.entrySet().stream()
.filter( entry -> entry.getValue() + cooldown < currTime )
.map( Map.Entry::getKey )
.iterator();
oldLogMessages.forEachRemaining(key -> messageMap.remove(key));
}
}
@Override
public void stop() {
housecleaning.shutdown();
messageMap.clear();
messageMap = null;
super.stop();