diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:59:10 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:59:10 +0100 |
| commit | d79c260758e7544dd46de2adfad85d1c0bee859b (patch) | |
| tree | b580925a77d14eaf1722b410bd0dabd795191a2e /src/catlfish_sup.erl | |
| parent | 5a10cf6fa6fff3cbca3340a7c75120603bda18ca (diff) | |
| parent | 87e02103ea3f47b825b415c415f7d2940d009b42 (diff) | |
Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-external-merge
Conflicts:
src/v1.erl
tools/merge.py
tools/testcase1.py
Diffstat (limited to 'src/catlfish_sup.erl')
| -rw-r--r-- | src/catlfish_sup.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/catlfish_sup.erl b/src/catlfish_sup.erl index abdac44..0b6c306 100644 --- a/src/catlfish_sup.erl +++ b/src/catlfish_sup.erl @@ -16,7 +16,7 @@ init([]) -> {cacertfile, application:get_env(catlfish, https_cacertfile, none)}], Servers = lists:map(fun (Config) -> - {IpAddress, Port, Module} = Config, + {ChildName, IpAddress, Port, Module} = Config, {ok, IPv4Address} = inet:parse_ipv4strict_address(IpAddress), WebConfig = [{ip, IPv4Address}, @@ -24,11 +24,12 @@ init([]) -> {ssl, true}, {ssl_opts, SSLOptions} ], - {catlfish_web, + {ChildName, {catlfish_web, start, [WebConfig, Module]}, permanent, 5000, worker, dynamic} end, application:get_env(catlfish, https_servers, [])), + lager:debug("Starting servers ~p", [Servers]), {ok, {{one_for_one, 3, 10}, Servers}}. |