From: Matt Mullins <mmullins@mmlx.us>
Date: Wed, 18 May 2011 05:33:32 +0000 (-0500)
Subject: Updated how configuration is bubbled through
X-Git-Tag: v4~15
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=00ae83ac53d6b7f8f3c351187c26d04b5c11ce41;p=erlbot.git

Updated how configuration is bubbled through
---

diff --git a/irc/irc_conn.erl b/irc/irc_conn.erl
index 53ce76e..31d1037 100644
--- a/irc/irc_conn.erl
+++ b/irc/irc_conn.erl
@@ -14,16 +14,17 @@
           code_change/3
         ]).
 
--record(irc_state, {instance, host, port, nick}).
+-record(irc_state, {instance, host, port, nick, socket}).
 
-start_link(Instance, Host, Port, Nick) ->
+start_link(Instance, Config) ->
     gen_server:start_link(?MODULE,
-        {Instance, Host, Port, Nick}, []).
+        {Instance, Config}, []).
 
-init({Instance, Host, Port, Nick}) ->
+init({Instance, {Host, Port, Nick}}) ->
+    {ok, Socket} = gen_tcp:connect(Host, Port, [list]),
     State = #irc_state{
         instance=Instance, host=Host,
-        port=Port, nick=Nick},
+        port=Port, nick=Nick, socket=Socket},
     {ok, State}.
 
 handle_call(_Request, _From, _State) ->
diff --git a/irc/irc_net_sup.erl b/irc/irc_net_sup.erl
index 64d0e6b..3d26ad6 100644
--- a/irc/irc_net_sup.erl
+++ b/irc/irc_net_sup.erl
@@ -11,13 +11,13 @@
 		]).
 -export([init/1]).
 
-start_link(Instance, Host, Port, Nick) ->
+start_link(Instance, Config) ->
 	supervisor:start_link(?MODULE,
-		{Instance, Host, Port, Nick}).
+		{Instance, Config}).
 
-init({Instance, Host, Port, Nick}) ->
+init({Instance, Config}) ->
 	Connection = {connection,
-                  {irc_conn, start_link, [Instance, Host, Port, Nick]},
+                  {irc_conn, start_link, [Instance, Config]},
                   permanent, % persistence type ("Restart" in the manual)
                   5,         % shutdown [sends signal, with timeout for response]
                   worker,    % it's not a supervisor itself