Skip to content

Commit b61bb9f

Browse files
committed
Events: Remove unused channel from EventHandler context
This commit removes a channel that became unneccessary after the refactoring of the events server and is preventing garbage collection of the handler struct when it goes out of scope. It also adds back the return of an error upon an errant send which will close the chat processing loop Change-Id: I2a771ee0e1d1c2518062c9bec962b48dd2d41e56 Signed-off-by: Patrick Mullaney <[email protected]>
1 parent 9e3bfde commit b61bb9f

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

events/producer/handler.go

-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
type handler struct {
2727
ChatStream pb.Events_ChatServer
28-
doneChan chan bool
2928
interestedEvents map[string]*pb.Interest
3029
}
3130

@@ -34,15 +33,13 @@ func newEventHandler(stream pb.Events_ChatServer) (*handler, error) {
3433
ChatStream: stream,
3534
}
3635
d.interestedEvents = make(map[string]*pb.Interest)
37-
d.doneChan = make(chan bool)
3836
return d, nil
3937
}
4038

4139
// Stop stops this handler
4240
func (d *handler) Stop() error {
4341
d.deregisterAll()
4442
d.interestedEvents = nil
45-
d.doneChan <- true
4643
return nil
4744
}
4845

events/producer/producer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (p *EventsServer) Chat(stream pb.Events_ChatServer) error {
6868
err = handler.HandleMessage(in)
6969
if err != nil {
7070
producerLogger.Errorf("Error handling message: %s", err)
71-
//return err
71+
return err
7272
}
7373

7474
}

0 commit comments

Comments
 (0)