|
|
@ -9,6 +9,7 @@ import mightypork.utils.control.bus.events.Event; |
|
|
|
import mightypork.utils.control.bus.events.types.DelayedEvent; |
|
|
|
import mightypork.utils.control.bus.events.types.DelayedEvent; |
|
|
|
import mightypork.utils.control.bus.events.types.ImmediateEvent; |
|
|
|
import mightypork.utils.control.bus.events.types.ImmediateEvent; |
|
|
|
import mightypork.utils.control.bus.events.types.SingleReceiverEvent; |
|
|
|
import mightypork.utils.control.bus.events.types.SingleReceiverEvent; |
|
|
|
|
|
|
|
import mightypork.utils.control.bus.events.types.UnloggedEvent; |
|
|
|
import mightypork.utils.control.interf.Destroyable; |
|
|
|
import mightypork.utils.control.interf.Destroyable; |
|
|
|
import mightypork.utils.logging.Log; |
|
|
|
import mightypork.utils.logging.Log; |
|
|
|
|
|
|
|
|
|
|
@ -46,6 +47,13 @@ final public class EventBus implements Destroyable { |
|
|
|
busThread.start(); |
|
|
|
busThread.start(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private boolean shallLog(Event<?> event) { |
|
|
|
|
|
|
|
if(!logSending) return false; |
|
|
|
|
|
|
|
if(event.getClass().isAnnotationPresent(UnloggedEvent.class)) return false; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Add a {@link EventChannel} to this bus.<br> |
|
|
|
* Add a {@link EventChannel} to this bus.<br> |
|
|
@ -150,7 +158,7 @@ final public class EventBus implements Destroyable { |
|
|
|
|
|
|
|
|
|
|
|
final DelayQueueEntry dm = new DelayQueueEntry(delay, event); |
|
|
|
final DelayQueueEntry dm = new DelayQueueEntry(delay, event); |
|
|
|
|
|
|
|
|
|
|
|
if (logSending) Log.f3("<bus> Q " + Log.str(event) + ", t = +" + delay + "s"); |
|
|
|
if (shallLog(event)) Log.f3("<bus> Q " + Log.str(event) + ", t = +" + delay + "s"); |
|
|
|
|
|
|
|
|
|
|
|
sendQueue.add(dm); |
|
|
|
sendQueue.add(dm); |
|
|
|
} |
|
|
|
} |
|
|
@ -167,7 +175,7 @@ final public class EventBus implements Destroyable { |
|
|
|
{ |
|
|
|
{ |
|
|
|
assertLive(); |
|
|
|
assertLive(); |
|
|
|
|
|
|
|
|
|
|
|
if (logSending) Log.f3("<bus> D " + Log.str(event)); |
|
|
|
if (shallLog(event)) Log.f3("<bus> D " + Log.str(event)); |
|
|
|
|
|
|
|
|
|
|
|
dispatch(event); |
|
|
|
dispatch(event); |
|
|
|
} |
|
|
|
} |
|
|
@ -203,7 +211,7 @@ final public class EventBus implements Destroyable { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!accepted) Log.e("<bus> Not accepted by any channel: " + Log.str(event)); |
|
|
|
if (!accepted) Log.e("<bus> Not accepted by any channel: " + Log.str(event)); |
|
|
|
if (logSending && !sent) Log.w("<bus> Not delivered: " + Log.str(event)); |
|
|
|
if (!sent && shallLog(event)) Log.w("<bus> Not delivered: " + Log.str(event)); |
|
|
|
|
|
|
|
|
|
|
|
channels.setBuffering(false); |
|
|
|
channels.setBuffering(false); |
|
|
|
clients.setBuffering(false); |
|
|
|
clients.setBuffering(false); |
|
|
|