go/ferret
go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-01-18 03:22:02 +02:00
Code Issues Releases Activity

Some tweaks in EventBroker

Browse Source
This commit is contained in:
Tim Voronov 2018-10-15 17:48:30 -04:00
parent 1d6a23fa96
commit 18b76be3fc
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/html/dynamic/events/broker.go
View File

@ -184,7 +184,7 @@ func (broker *EventBroker) runLoop(ctx context.Context) {
case <-broker.onLoad.Ready():
reply, err := broker.onLoad.Recv()
broker.emit(EventLoad, reply, err)
broker.emit(ctx, EventLoad, reply, err)
default:
}
@ -194,7 +194,7 @@ func (broker *EventBroker) runLoop(ctx context.Context) {
case <-broker.onReload.Ready():
reply, err := broker.onReload.Recv()
broker.emit(EventReload, reply, err)
broker.emit(ctx, EventReload, reply, err)
default:
}
@ -204,7 +204,7 @@ func (broker *EventBroker) runLoop(ctx context.Context) {
case <-broker.onAttrModified.Ready():
reply, err := broker.onAttrModified.Recv()
broker.emit(EventAttrModified, reply, err)
broker.emit(ctx, EventAttrModified, reply, err)
default:
}
@ -214,7 +214,7 @@ func (broker *EventBroker) runLoop(ctx context.Context) {
case <-broker.onAttrRemoved.Ready():
reply, err := broker.onAttrRemoved.Recv()
broker.emit(EventAttrRemoved, reply, err)
broker.emit(ctx, EventAttrRemoved, reply, err)
default:
}
@ -224,7 +224,7 @@ func (broker *EventBroker) runLoop(ctx context.Context) {
case <-broker.onChildNodeCountUpdated.Ready():
reply, err := broker.onChildNodeCountUpdated.Recv()
broker.emit(EventChildNodeCountUpdated, reply, err)
broker.emit(ctx, EventChildNodeCountUpdated, reply, err)
default:
}
@ -235,7 +235,7 @@ func (broker *EventBroker) runLoop(ctx context.Context) {
case <-broker.onChildNodeInserted.Ready():
reply, err := broker.onChildNodeInserted.Recv()
broker.emit(EventChildNodeInserted, reply, err)
broker.emit(ctx, EventChildNodeInserted, reply, err)
default:
}
@ -245,13 +245,13 @@ func (broker *EventBroker) runLoop(ctx context.Context) {
case <-broker.onChildNodeRemoved.Ready():
reply, err := broker.onChildNodeRemoved.Recv()
broker.emit(EventChildNodeRemoved, reply, err)
broker.emit(ctx, EventChildNodeRemoved, reply, err)
default:
}
}
}
func (broker *EventBroker) emit(event Event, message interface{}, err error) {
func (broker *EventBroker) emit(ctx context.Context, event Event, message interface{}, err error) {
if err != nil {
event = EventError
message = err
@ -271,7 +271,12 @@ func (broker *EventBroker) emit(event Event, message interface{}, err error) {
go func() {
for _, listener := range snapshot {
listener(message)
select {
case <-ctx.Done():
return
default:
listener(message)
}
}
}()
}

11
pkg/html/dynamic/events/broker_test.go
View File

@ -263,15 +263,19 @@ func TestEventBroker(t *testing.T) {
defer b.Stop()
counter := 0
listener := func(message interface{}) {
var listener events.EventListener
listener = func(message interface{}) {
counter += 1
b.RemoveEventListener(events.EventLoad, listener)
}
b.AddEventListener(events.EventLoad, listener)
b.OnLoad.Emit(&page.LoadEventFiredReply{})
time.Sleep(time.Duration(10) * time.Millisecond)
b.RemoveEventListener(events.EventLoad, listener)
StressTestAsync(func() error {
b.OnLoad.Emit(&page.LoadEventFiredReply{})
@ -292,14 +296,13 @@ func TestEventBroker(t *testing.T) {
counter := 0
b.AddEventListener(events.EventLoad, func(message interface{}) {
counter++
b.Stop()
})
b.OnLoad.EmitDefault()
time.Sleep(time.Duration(5) * time.Millisecond)
b.Stop()
go func() {
b.OnLoad.EmitDefault()
}()