Merge pull request cockroachdb#30 from crowdflux/himanshu-github

adding rabbitmq configuration in config file
soniabhishek · Oct 7, 2016 · 0395606 · 0395606
2 parents 0999b67 + d24257b
commit 0395606
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/app/DAL/clients/rabbitmq/rabbitmq.go b/app/DAL/clients/rabbitmq/rabbitmq.go
@@ -1,6 +1,9 @@
 package rabbitmq
 
-import "github.com/streadway/amqp"
+import (
+	"github.com/crowdflux/angel/app/config"
+	"github.com/streadway/amqp"
+)
 
 var rabbitmqConn *amqp.Connection
 
@@ -10,7 +13,11 @@ func init() {
 
 func initRabbitMqClient() *amqp.Connection {
 
-	conn, err := amqp.Dial("amqp://guest:guest@localhost:5672/")
+	username := config.RABBITMQ_USERNAME.Get()
+	password := config.RABBITMQ_PASSWORD.Get()
+	host := config.RABBITMQ_HOST.Get()
+
+	conn, err := amqp.Dial("amqp://" + username + ":" + password + "@" + host + ":5672/")
 	if err != nil {
 		panic(err)
 	}

diff --git a/app/config/config_keys.go b/app/config/config_keys.go
@@ -50,6 +50,10 @@ const (
 	PLOG_LEVEL = configKey("plog.log_level")
 
 	NEW_RELIC_KEY = configKey("newrelic.key")
+
+	RABBITMQ_USERNAME = configKey("rabbitmq.username")
+	RABBITMQ_PASSWORD = configKey("rabbitmq.password")
+	RABBITMQ_HOST     = configKey("rabbitmq.host")
 )
 
 // Gets the value for given key from the config file.

diff --git a/app/config/development_example.json b/app/config/development_example.json
@@ -92,6 +92,11 @@
     "log_level" : "<log_level>"
   },
   "newrelic" : {
-    "key" : "<newrelic_licence_key>"
+    "key": "<newrelic_licence_key>"
+  },
+  "rabbitmq" : {
+    "username" : "guest",
+    "password" : "guest",
+    "host" : "localhost"
   }
 }