Merge pull request #119 from pinpt/NAN-543/smartshovel

NAN-543: smartshovel addition to rabbitmq common code

Author: Jon Mullen

event/event.go

@@ -32,6 +32,9 @@ var EventDebug = os.Getenv("PP_EVENT_DEBUG") == "1"
 
 const jsonContentType = "application/json"
 
+// IngestQueueName is the name of the eventapi ingest queue
+const IngestQueueName = "event-api-ingest"
+
 // PublishEvent is the container for a model event
 type PublishEvent struct {
 	Object  datamodel.Model
@@ -841,6 +844,10 @@ type Subscription struct {
 
 //GenerateQueueName takes in a Subscription, extracts the headers and topics and returns a consistent but unique queue name
 func GenerateQueueName(subscription Subscription) string {
+	// if the queue name is IngestQueueName, short circuit and just return the groupid = queue name, since we need this to be static
+	if subscription.GroupID == IngestQueueName {
+		return IngestQueueName
+	}
 	hashkeys := []string{}
 	for k, v := range subscription.Headers {
 		hashkeys = append(hashkeys, k, v)
@@ -853,6 +860,8 @@ func GenerateQueueName(subscription Subscription) string {
 	sort.Strings(hashkeys)
 	queueName := subscription.GroupID + "-" + hash.Values(hashkeys) // has the matching headers and topics so we create a consistent but unique queue
 
+
+
 	return queueName
 }
 

event/event_test.go

@@ -707,4 +707,13 @@ func TestGenerateQueueName(t *testing.T) {
 
 	//Test that changing how the headers are ordered generates the same name
 	assert.Equal(queueName4, queueName5)
+
+	sub6 := Subscription{
+		GroupID: IngestQueueName,
+		Topics:  []string{"atopic",},
+	}
+	queueName6 := GenerateQueueName(sub6)
+
+	//Test that using the ingestqueuename results in the same name
+	assert.Equal(IngestQueueName, queueName6)
 }