clean up

johnmcclean · johnmcclean · commit 512a73cde62f · 2016-10-21T15:33:51.000+01:00
diff --git a/micro-events/src/main/java/com/aol/micro/server/events/JobsBeingExecuted.java b/micro-events/src/main/java/com/aol/micro/server/events/JobsBeingExecuted.java
@@ -30,10 +30,10 @@ public class JobsBeingExecuted {
 
     private final LoggingRateLimiter<Class> loggingRateLimiter;
 
-    private final int maxLoggingCapacity;
+    private final long maxLoggingCapacity;
 
     public JobsBeingExecuted(@Qualifier("microserverEventBus") EventBus bus,
-            @Value("${system.logging.max.per.hour:10}") int maxLoggingCapacity) {
+            @Value("${system.logging.max.per.hour:10}") long maxLoggingCapacity) {
         this.eventBus = bus;
         this.loggingRateLimiter = new LoggingRateLimiter<>();
         this.maxLoggingCapacity = maxLoggingCapacity;
@@ -104,7 +104,7 @@ private void logSystemEvent(final ProceedingJoinPoint pjp, final String type, Jo
                                                     .getClass());
         loggingRateLimiter.capacityAvailable(pjp.getTarget()
                                                 .getClass(),
-                                             10, new Runnable() {
+                                             this.maxLoggingCapacity, new Runnable() {
                                                  @Override
                                                  public void run() {
                                                      postEvent(pjp, type, data, active);
diff --git a/micro-events/src/main/java/com/aol/micro/server/events/LoggingRateLimiter.java b/micro-events/src/main/java/com/aol/micro/server/events/LoggingRateLimiter.java
@@ -2,43 +2,45 @@
 
 import java.util.Date;
 
+import com.google.common.collect.ConcurrentHashMultiset;
+
 import lombok.AccessLevel;
 import lombok.Getter;
 
-import com.google.common.collect.ConcurrentHashMultiset;
+public class LoggingRateLimiter<T> {
 
+    @Getter(AccessLevel.PACKAGE)
+    private volatile ConcurrentHashMultiset<T> frequency = ConcurrentHashMultiset.create();
+    private volatile Date lastCleared = new Date(
+                                                 0);
+    private final int limit;
 
-public class LoggingRateLimiter<T> {
+    public LoggingRateLimiter(int limit) {
+        this.limit = limit;
+    }
+
+    public LoggingRateLimiter() {
+        this.limit = (60 * 1000 * 60);
+    }
+
+    public void addAndEnsureFrequency(T clazz) {
+        resetAfterLimit();
+        frequency.add(clazz);
+    }
+
+    public void resetAfterLimit() {
+        if (System.currentTimeMillis() - limit > lastCleared.getTime()) {
+            frequency = ConcurrentHashMultiset.create();
+            lastCleared = new Date(
+                                   System.currentTimeMillis());
+        }
+
+    }
+
+    public void capacityAvailable(T t, long max, Runnable run) {
+        if (frequency.count(t) < max)
+            run.run();
 
-	@Getter(AccessLevel.PACKAGE)
-	private volatile ConcurrentHashMultiset<T> frequency = ConcurrentHashMultiset.create();
-	private volatile Date lastCleared = new Date(0);
-	private final int limit;
-	
-	public LoggingRateLimiter(int limit){
-		this.limit = limit;
-	}
-	
-	public LoggingRateLimiter(){
-		this.limit=(60 *1000*60);
-	}
-	
-	public void addAndEnsureFrequency(T clazz){
-		resetAfterLimit();
-		frequency.add(clazz);	
-	}
-	public void resetAfterLimit(){
-		if (System.currentTimeMillis() - limit  > lastCleared.getTime()){
-			frequency = ConcurrentHashMultiset.create();
-			lastCleared = new Date(System.currentTimeMillis());
-		}
-		
-	}
-	
-	public void capacityAvailable(T t, int max, Runnable run){
-		if(frequency.count(t) < max)
-			run.run();
-		
-	}
+    }
 
 }
