From b61bb9f89469a51fb269582a4fc6acd9897189a8 Mon Sep 17 00:00:00 2001 From: Patrick Mullaney Date: Tue, 30 Aug 2016 17:29:08 -0400 Subject: [PATCH] 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 --- events/producer/handler.go | 3 --- events/producer/producer.go | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/events/producer/handler.go b/events/producer/handler.go index 57befb82308..4ffe8e2022d 100644 --- a/events/producer/handler.go +++ b/events/producer/handler.go @@ -25,7 +25,6 @@ import ( type handler struct { ChatStream pb.Events_ChatServer - doneChan chan bool interestedEvents map[string]*pb.Interest } @@ -34,7 +33,6 @@ func newEventHandler(stream pb.Events_ChatServer) (*handler, error) { ChatStream: stream, } d.interestedEvents = make(map[string]*pb.Interest) - d.doneChan = make(chan bool) return d, nil } @@ -42,7 +40,6 @@ func newEventHandler(stream pb.Events_ChatServer) (*handler, error) { func (d *handler) Stop() error { d.deregisterAll() d.interestedEvents = nil - d.doneChan <- true return nil } diff --git a/events/producer/producer.go b/events/producer/producer.go index 4e70d0fd56a..85508b936fe 100644 --- a/events/producer/producer.go +++ b/events/producer/producer.go @@ -68,7 +68,7 @@ func (p *EventsServer) Chat(stream pb.Events_ChatServer) error { err = handler.HandleMessage(in) if err != nil { producerLogger.Errorf("Error handling message: %s", err) - //return err + return err } }