clean TODOs and fix build-fail

- allow multiple origin bits enabled for a single event - make sure 127.0.0.1 works as expected as localhost
mission-liao · Dec 30, 2015 · ce6cad0 · ce6cad0
1 parent 5da9ec5
commit ce6cad0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
diff --git a/amqp/amqp_test.go b/amqp/amqp_test.go
@@ -24,3 +24,15 @@ func TestAmqpInitClose(t *testing.T) {
 
 	ass.Nil(conn.Close())
 }
+
+func TestAmqp127_0_0_1(t *testing.T) {
+	ass := assert.New(t)
+	conn, err := newConnection(DefaultAmqpConfig().Host("127.0.0.1"))
+	ass.Nil(err)
+
+	ch, err := conn.Channel()
+	ass.Nil(err)
+	defer conn.ReleaseChannel(ch)
+
+	ass.Nil(conn.Close())
+}
diff --git a/amqp/broker.go b/amqp/broker.go
@@ -305,7 +305,7 @@ func (me *broker) _consumer_routine_(
 		nil,   // args
 	)
 	if err != nil {
-		events <- dingo.NewEventFromError(dingo.ObjT.Consumer, err)
+		events <- dingo.NewEventFromError(dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer, err)
 		return
 	}
 
@@ -324,7 +324,7 @@ func (me *broker) _consumer_routine_(
 				defer func() {
 					if err != nil || !ok {
 						d.Nack(false, false)
-						events <- dingo.NewEventFromError(dingo.ObjT.Consumer, err)
+						events <- dingo.NewEventFromError(dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer, err)
 					} else {
 						d.Ack(false)
 					}
@@ -361,7 +361,7 @@ func (me *broker) _consumer_routine_(
 clean:
 	err_ := ci.Channel.Cancel(tag, false)
 	if err_ != nil {
-		events <- dingo.NewEventFromError(dingo.ObjT.Consumer, err_)
+		events <- dingo.NewEventFromError(dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer, err_)
 		// should we return here?,
 		// we still need to clean the delivery channel...
 	}

diff --git a/bridge_local_test.go b/bridge_local_test.go
@@ -1,7 +1,6 @@
 package dingo
 
 import (
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/suite"

diff --git a/dingo_api_test.go b/dingo_api_test.go
@@ -274,6 +274,11 @@ func TestDingoEventOrigin(t *testing.T) {
 	chk(chAll, dingo.ObjT.Bridge)
 	chk(chBridge, dingo.ObjT.Bridge)
 
+	// send a mapper | bridge event
+	obj.events <- dingo.NewEvent(dingo.ObjT.Bridge|dingo.ObjT.Mapper, dingo.EventLvl.Error, 0, "bridge")
+	chk(chAll, dingo.ObjT.Bridge|dingo.ObjT.Mapper)
+	chk(chBridge, dingo.ObjT.Bridge|dingo.ObjT.Mapper)
+
 	err = app.StopListen(idBridge)
 	if err != nil {
 		return

diff --git a/redis/broker.go b/redis/broker.go
@@ -129,7 +129,7 @@ func (me *broker) _consumer_routine_(
 			// blocking call on redis server
 			reply, err := conn.Do("BRPOP", qn, me.cfg.GetListenTimeout())
 			if err != nil {
-				events <- dingo.NewEventFromError(dingo.ObjT.Consumer, err)
+				events <- dingo.NewEventFromError(dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer, err)
 				break
 			}
 
@@ -143,14 +143,14 @@ func (me *broker) _consumer_routine_(
 			v, ok := reply.([]interface{})
 			if !ok {
 				events <- dingo.NewEventFromError(
-					dingo.ObjT.Consumer,
+					dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer,
 					errors.New(fmt.Sprintf("invalid reply: %v", reply)),
 				)
 				break
 			}
 			if len(v) != 2 {
 				events <- dingo.NewEventFromError(
-					dingo.ObjT.Consumer,
+					dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer,
 					errors.New(fmt.Sprintf("invalid reply: %v", reply)),
 				)
 				break
@@ -159,15 +159,15 @@ func (me *broker) _consumer_routine_(
 			b, ok := v[1].([]byte)
 			if !ok {
 				events <- dingo.NewEventFromError(
-					dingo.ObjT.Consumer,
+					dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer,
 					errors.New(fmt.Sprintf("invalid reply: %v", reply)),
 				)
 				break
 			}
 
 			h, err := dingo.DecodeHeader(b)
 			if err != nil {
-				events <- dingo.NewEventFromError(dingo.ObjT.Consumer, err)
+				events <- dingo.NewEventFromError(dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer, err)
 				break
 			}
 
@@ -179,7 +179,7 @@ func (me *broker) _consumer_routine_(
 
 			if rcpt.ID != h.ID() {
 				events <- dingo.NewEventFromError(
-					dingo.ObjT.Consumer,
+					dingo.ObjT.Consumer|dingo.ObjT.NamedConsumer,
 					errors.New(fmt.Sprintf("expected: %v, received: %v", h, rcpt)),
 				)
 				break