From 1462b94617b0c97b9e625d2c3a379a734ecb1dd8 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Tue, 31 Mar 2015 00:35:57 +0200 Subject: Fix --- src/catlfish_sup.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/catlfish_sup.erl') diff --git a/src/catlfish_sup.erl b/src/catlfish_sup.erl index 8a8322d..882a017 100644 --- a/src/catlfish_sup.erl +++ b/src/catlfish_sup.erl @@ -9,7 +9,7 @@ start_link(_Args) -> supervisor:start_link({local, ?MODULE}, ?MODULE, []). -gen_http_config(Config, SSLFlag) -> +gen_http_config(Config, SSLOptions, SSLFlag) -> {ChildName, IpAddress, Port, Module} = Config, {ok, IPv4Address} = inet:parse_ipv4strict_address(IpAddress), @@ -20,7 +20,7 @@ gen_http_config(Config, SSLFlag) -> {ssl_opts, SSLOptions} ], {ChildName, - {catlfish_web, start, [WebConfig, Module]}, + {catlfish_web, start, [WebConfig, Module, ChildName]}, permanent, 5000, worker, dynamic}. @@ -31,10 +31,10 @@ init([]) -> {cacertfile, application:get_env(catlfish, https_cacertfile, none)}], Servers = lists:map(fun (Config) -> - gen_http_config(Config, true) + gen_http_config(Config, SSLOptions, true) end, application:get_env(catlfish, https_servers, [])) ++ lists:map(fun (Config) -> - gen_http_config(Config, false) + gen_http_config(Config, SSLOptions, false) end, application:get_env(catlfish, http_servers, [])), lager:debug("Starting servers ~p", [Servers]), {ok, -- cgit v1.1