Skip to content

fix: safely close event broker subscription channels #2254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moloch-- merged 1 commit into from
Apr 30, 2026
+6 −3
Merged

fix: safely close event broker subscription channels #2254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions server/core/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ const (
)

// Event - An event is fired when there's a state change involving a
// session, job, or client.
//
// session, job, or client.
type Event struct {
Session *Session
Job *Job
Expand Down Expand Up @@ -62,7 +63,10 @@ func (broker *eventBroker) Start() {
case sub := <-broker.subscribe:
subscribers[sub] = struct{}{}
case sub := <-broker.unsubscribe:
delete(subscribers, sub)
if _, ok := subscribers[sub]; ok {
delete(subscribers, sub)
close(sub)
}
case event := <-broker.publish:
for sub := range subscribers {
sub <- event
Expand All @@ -86,7 +90,6 @@ func (broker *eventBroker) Subscribe() chan Event {
// Unsubscribe - Remove a subscription channel
func (broker *eventBroker) Unsubscribe(events chan Event) {
broker.unsubscribe <- events
close(events)
}

// Publish - Push a message to all subscribers
Expand Down
Loading