Skip to content

Clean up client listeners #2

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
beatgammit merged 1 commit into from
Oct 31, 2016
Merged

Clean up client listeners #2

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
16 changes: 16 additions & 0 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,11 @@ func (c *Client) registerListener(id ID) {
c.listeners[id] = wait
}

func (c *Client) unregisterListener(id ID) {
log.Println("unregister listener:", id)
delete(c.listeners, id)
}

func (c *Client) waitOnListener(id ID) (msg Message, err error) {
log.Println("wait on listener:", id)
c.lock.RLock()
Expand All @@ -341,6 +346,9 @@ type EventHandler func(args []interface{}, kwargs map[string]interface{})
func (c *Client) Subscribe(topic string, fn EventHandler) error {
id := NewID()
c.registerListener(id)
// TODO: figure out where to clean this up
// defer c.unregisterListener(id)

sub := &Subscribe{
Request: id,
Options: make(map[string]interface{}),
Expand Down Expand Up @@ -386,6 +394,8 @@ func (c *Client) Unsubscribe(topic string) error {

id := NewID()
c.registerListener(id)
defer c.unregisterListener(id)

sub := &Unsubscribe{
Request: id,
Subscription: subscriptionID,
Expand Down Expand Up @@ -418,6 +428,9 @@ type MethodHandler func(
func (c *Client) Register(procedure string, fn MethodHandler, options map[string]interface{}) error {
id := NewID()
c.registerListener(id)
// TODO: figure out where to clean this up
// defer c.unregisterListener(id)

register := &Register{
Request: id,
Options: options,
Expand Down Expand Up @@ -475,6 +488,8 @@ func (c *Client) Unregister(procedure string) error {
}
id := NewID()
c.registerListener(id)
defer c.unregisterListener(id)

unregister := &Unregister{
Request: id,
Registration: procedureID,
Expand Down Expand Up @@ -523,6 +538,7 @@ func (rpc RPCError) Error() string {
func (c *Client) Call(procedure string, args []interface{}, kwargs map[string]interface{}) (*Result, error) {
id := NewID()
c.registerListener(id)
defer c.unregisterListener(id)

call := &Call{
Request: id,
Expand Down