--- miscJava/CircuitBreaker/src/main/java/dk/thoerup/circuitbreaker/LoggingCircuitBreaker.java 2015/06/09 07:42:41 2568 +++ miscJava/CircuitBreaker/src/main/java/dk/thoerup/circuitbreaker/LoggingCircuitBreaker.java 2015/06/09 08:55:10 2569 @@ -4,8 +4,8 @@ import java.util.LinkedList; import dk.thoerup.circuitbreaker.config.BreakerConfig; -import dk.thoerup.circuitbreaker.notification.Notifier; +@Deprecated public class LoggingCircuitBreaker extends AccountingCircuitBreaker { private LinkedList log = new LinkedList(); @@ -14,10 +14,10 @@ public class LogEntry { public long time; - public Notifier.Event event; + public Event event; public int count = 1; - public LogEntry(Notifier.Event evnt) { + public LogEntry(Event evnt) { this.event = evnt; this.time = System.currentTimeMillis(); } @@ -32,7 +32,7 @@ String str = new Date(time).toString() + (" : ") + event; - if (event == Notifier.Event.BreakerRetripped) { + if (event == Event.BreakerRetripped) { str += ( ", " + count + " re-trips" ); } @@ -50,31 +50,31 @@ @Override public void tripBreaker() { super.tripBreaker(); - addEntry(Notifier.Event.BreakerTripped); + addEntry(Event.BreakerTripped); } @Override public void retripBreaker() { super.retripBreaker(); - addEntry(Notifier.Event.BreakerRetripped); + addEntry(Event.BreakerRetripped); } @Override public void reset() { super.reset(); - addEntry(Notifier.Event.BreakerReset); + addEntry(Event.BreakerReset); } - private void addEntry(Notifier.Event event) { + private void addEntry(Event event) { synchronized(this) { - if (event != Notifier.Event.BreakerRetripped ) { + if (event != Event.BreakerRetripped ) { log.addFirst( new LogEntry(event) ); //trip and reset are added unconditionally } else { - if (log.size() == 0 || log.getFirst().event != Notifier.Event.BreakerRetripped) { + if (log.size() == 0 || log.getFirst().event != Event.BreakerRetripped) { log.addFirst( new LogEntry(event) ); } else { log.getFirst().newRetrip();