From: Matt Mullins <mmullins@mmlx.us>
Date: Thu, 1 Sep 2011 20:33:21 +0000 (-0500)
Subject: Add configuration support for AMQP username/password/vhost
X-Git-Tag: v5~6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9e30f98cced2ff814365351f17e212a933f4cd6e;p=erlbot.git

Add configuration support for AMQP username/password/vhost
---

diff --git a/amqp/amqp_bot_connection.erl b/amqp/amqp_bot_connection.erl
index e0744eb..a851e8c 100644
--- a/amqp/amqp_bot_connection.erl
+++ b/amqp/amqp_bot_connection.erl
@@ -34,6 +34,25 @@ handle_call(get_connection, _From, Connection) ->
     {reply, Connection, Connection}.
 
 start_link_connection() ->
-    {ok, Pid} = amqp_connection:start(#amqp_params_network{}),
+    Username = get_config(username, "guest"),
+    Password = get_config(password, "guest"),
+    VHost = get_config(vhost, "/"),
+    {ok, Pid} = amqp_connection:start(
+                    #amqp_params_network{username = Username,
+                                         password = Password,
+                                         virtual_host = VHost
+                                        }),
     link(Pid),
     {ok, Pid}.
+
+get_config(Key, Default) ->
+    DataList = case config:get_config(amqp) of
+        [Config] ->
+            case lists:keyfind(Key, 1, Config) of
+                {Key, Data} -> Data;
+                false -> Default
+            end;
+        [] ->
+            Default
+    end,
+    list_to_binary(DataList).