diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/catlfish_sup.erl | 8 | ||||
| -rw-r--r-- | src/catlfish_web.erl | 6 |
2 files changed, 7 insertions, 7 deletions
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, diff --git a/src/catlfish_web.erl b/src/catlfish_web.erl index 5ee5743..f9fe6d6 100644 --- a/src/catlfish_web.erl +++ b/src/catlfish_web.erl @@ -2,14 +2,14 @@ %%% See LICENSE for licensing information. -module(catlfish_web). --export([start/2, loop/2]). +-export([start/3, loop/2]). -start(Options, Module) -> +start(Options, Module, Name) -> lager:debug("Starting catlfish web server: ~p", [Module]), Loop = fun (Req) -> ?MODULE:loop(Req, Module) end, - mochiweb_http:start([{name, Module}, {loop, Loop} | Options]). + mochiweb_http:start([{name, Name}, {loop, Loop} | Options]). add_auth(Path, {Code, Headers, Data}) -> |