From d74792a5919c67ef3d0f8fba23f9f54719851bfd Mon Sep 17 00:00:00 2001
From: Gregory Eremin <g@erem.in>
Date: Wed, 24 Sep 2014 16:52:31 +0400
Subject: [PATCH] Rename result into message

---
 hub/hub.go          |  4 ++--
 hub/subscription.go | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hub/hub.go b/hub/hub.go
index 92b1dba..235907f 100644
--- a/hub/hub.go
+++ b/hub/hub.go
@@ -35,7 +35,7 @@ func (h *Hub) Pub(queue string, msg []byte) bool {
 			default:
 			}
 
-			if ok := s.Send(Result{queue, msg}); ok {
+			if ok := s.Send(Message{queue, msg}); ok {
 				return true
 			}
 		}
@@ -49,7 +49,7 @@ func (h *Hub) Pub(queue string, msg []byte) bool {
 func (h *Hub) Sub(s *Subscription) {
 	for _, q := range s.Queues {
 		if msg, ok := h.storage.Get(q); ok {
-			s.Send(Result{q, msg})
+			s.Send(Message{q, msg})
 			return
 		}
 	}
diff --git a/hub/subscription.go b/hub/subscription.go
index 38b79dc..f011090 100644
--- a/hub/subscription.go
+++ b/hub/subscription.go
@@ -3,10 +3,10 @@ package hub
 type (
 	Subscription struct {
 		Queues []string
-		result chan Result
+		result chan Message
 		done   chan struct{}
 	}
-	Result struct {
+	Message struct {
 		Queue   string
 		Message []byte
 	}
@@ -15,7 +15,7 @@ type (
 func NewSubscription(queues []string) *Subscription {
 	return &Subscription{
 		Queues: queues,
-		result: make(chan Result),
+		result: make(chan Message),
 		done:   make(chan struct{}),
 	}
 }
@@ -30,7 +30,7 @@ func (s *Subscription) Need(queue string) bool {
 	return false
 }
 
-func (s *Subscription) Send(res Result) bool {
+func (s *Subscription) Send(msg Message) bool {
 	success := make(chan bool)
 
 	go func() {
@@ -40,14 +40,14 @@ func (s *Subscription) Send(res Result) bool {
 			}
 		}()
 
-		s.result <- res
+		s.result <- msg
 		success <- true
 	}()
 
 	return <-success
 }
 
-func (s *Subscription) Result() <-chan Result {
+func (s *Subscription) Result() <-chan Message {
 	return s.result
 }