add support for multiple antidote addresses and ports

include/fmk.hrl

@@ -1,6 +1,6 @@
 %%-define(ANTIDOTE, 'antidote@127.0.0.1').
--define(DEFAULT_ANTIDOTE_PORT, 8087).
--define(DEFAULT_ANTIDOTE_ADDRESS, "127.0.0.1").
+-define(DEFAULT_ANTIDOTE_PORT, "[8087]").
+-define(DEFAULT_ANTIDOTE_ADDRESS, "[127.0.0.1]").
 -define (DEFAULT_FMKE_HTTP_PORT, 9090).
 -define (APP, fmke).
 -define (VAR_ANTIDOTE_PB_PID, antidote_pb_pid).

src/antidote_pool.erl

@@ -40,22 +40,26 @@ with_connection(Fun) ->
 %%%===================================================================
 
 init(_Options) ->
-  AntidotePort = list_to_integer(fmk_config:get(antidote_port, "8087")),
-  AntidoteAddress = fmk_config:get(antidote_address,'127.0.0.1'),
+  ListAntidotePorts = fmk_config:get(antidote_port, ["8087"]),
+  ListAntidoteAddresses = fmk_config:get(antidote_address,["127.0.0.1"]),
   PoolArgs = [
     {name, {local, antidote_connection_pool}},
     {worker_module, ?MODULE},
     {size, 30},
     {max_overflow, 0}
   ],
-  WorkerArgs = [AntidoteAddress, AntidotePort],
+  WorkerArgs = [ListAntidoteAddresses, ListAntidotePorts],
   PoolSpec = poolboy:child_spec(antidote_connection_pool, PoolArgs, WorkerArgs),
   {ok, {{one_for_one, 10, 10}, [PoolSpec]}}.
 
 
 
 
-start_link([Hostname, Port]) ->
+start_link([ListHostnames, ListPorts]) ->
+  true = length(ListHostnames) =:= length(ListPorts),
+  Index = rand:uniform(length(ListHostnames)),
+  Hostname = lists:nth(Index,ListHostnames),
+  Port = list_to_integer(lists:nth(Index,ListPorts)),
   io:format("Connecting to ~p:~p~n", [Hostname, Port]),
   {ok, Pid} = antidotec_pb_socket:start_link(Hostname, Port),
   io:format("Connected to ~p:~p --> ~p ~n", [Hostname, Port, Pid]),

src/fmk_app.erl

@@ -49,7 +49,20 @@ stop(_State) ->
 %%====================================================================
 %% Internal functions
 %%====================================================================
-
+set_application_variable(antidote_address, "ANTIDOTE_ADDRESS", ?DEFAULT_ANTIDOTE_ADDRESS) ->
+  %% try to load value from environment variable
+  Default = os:getenv("ANTIDOTE_ADDRESS", ?DEFAULT_ANTIDOTE_ADDRESS),
+  ListAddresses = parse_list_from_env_var(Default),
+  Value = application:get_env(?APP,antidote_address,ListAddresses),
+  fmk_config:set(antidote_address,Value),
+  Value;
+set_application_variable(antidote_port, "ANTIDOTE_PB_PORT", ?DEFAULT_ANTIDOTE_PORT) ->
+  %% try to load value from environment variable
+  Default = os:getenv("ANTIDOTE_PB_PORT", ?DEFAULT_ANTIDOTE_PORT),
+  ListPorts = parse_list_from_env_var(Default),
+  Value = application:get_env(?APP,antidote_port,ListPorts),
+  fmk_config:set(antidote_port,Value),
+  Value;
 set_application_variable(ApplicationVariable, EnvironmentVariable, EnvironmentDefault) ->
   %% try to load value from environment variable
   Default = os:getenv(EnvironmentVariable, EnvironmentDefault),
@@ -74,3 +87,12 @@ close_antidote_socket() ->
         _SomethingElse ->
             ok
     end.
+
+parse_list_from_env_var(String) ->
+  io:format("RECEIVED: ~p\n",[String]),
+    try
+        string:tokens(String,",") %% CSV style
+    catch
+        _:_  ->
+            bad_input_format
+    end.