views: hear a seat's event on its bare subject as on its further parts
A seat's contract says an event on its bare subject (the seat mesh-catalog's registration-changed), while both view readers adopted it on `<subject>.>` alone, so the event hub acknowledged it unhandled and the part never acted. The process reader now registers one handler on both forms of the hub (the two patterns do not overlap, so a message reaches it once), and the stdio reader subscribes both forms with the one handler. Builds: design 47 H H-A-166
This commit is contained in:
@@ -175,8 +175,7 @@ func (r *ProcessReader) Adopt(f *Follower, seat, event string, hear func(context
|
||||
hub, handle := r.hub, r.handle
|
||||
r.mu.Unlock()
|
||||
if subject != "" && hub != nil {
|
||||
// one subscription per event, with every further part (design 47 G §532)
|
||||
if err := hub.Handle(subject+".>", handle); err != nil {
|
||||
if err := handleEvent(hub, subject, handle); err != nil {
|
||||
r.logf("views: %s's event %s is not heard (%v): the view %s is its first view's alone, asked again by hand", r.Module, subject, err, p.bucket)
|
||||
}
|
||||
}
|
||||
@@ -202,8 +201,7 @@ func (r *ProcessReader) AdoptEvent(seat, event string, hear func(context.Context
|
||||
hub, handle := r.hub, r.handle
|
||||
r.mu.Unlock()
|
||||
if fresh && hub != nil {
|
||||
// one subscription per event, with every further part (design 47 G §532)
|
||||
if err := hub.Handle(subject+".>", handle); err != nil {
|
||||
if err := handleEvent(hub, subject, handle); err != nil {
|
||||
r.logf("views: %s's event %s is not heard (%v)", r.Module, subject, err)
|
||||
}
|
||||
}
|
||||
@@ -861,9 +859,8 @@ func (r *ProcessReader) Start(ctx context.Context, js jetstream.JetStream, cred
|
||||
subjects := slices.Sorted(maps.Keys(r.adopted))
|
||||
r.mu.Unlock()
|
||||
for _, subject := range subjects {
|
||||
// one subscription per event, with every further part (design 47 G §532)
|
||||
if err == nil {
|
||||
err = hub.Handle(subject+".>", hear)
|
||||
err = handleEvent(hub, subject, hear)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -891,6 +888,16 @@ func (r *ProcessReader) Start(ctx context.Context, js jetstream.JetStream, cred
|
||||
r.Ask(ctx, said)
|
||||
}
|
||||
|
||||
// handleEvent registers handle on the hub for a seat's event on its bare subject and on every further part after it
|
||||
// (`<subject>.>`): one handler, both forms, as the seat's contract says the event on either (design 47 H, H-A-166; one
|
||||
// subscription per event, design 47 G §532). The two patterns do not overlap, so a message reaches the handler once.
|
||||
func handleEvent(hub *process.EventHub, subject string, handle func(jetstream.Msg)) error {
|
||||
if err := hub.Handle(subject, handle); err != nil {
|
||||
return err
|
||||
}
|
||||
return hub.Handle(subject+".>", handle)
|
||||
}
|
||||
|
||||
// adoptedHears are the handlers of every follower adopted on the event whose subject is subject or has further parts
|
||||
// after it (`<event>.<module>.<branch>.<commit or group>`, design 47 G §521, §532), or nil.
|
||||
func adoptedHears(adopted map[string][]adoptedHear, subject string) []adoptedHear {
|
||||
|
||||
Reference in New Issue
Block a user