anthonycicc/httparrot
1
0
Fork 0
mirror of https://github.com/edgurgel/httparrot synced 2025-04-06 00:32:34 -04:00
Code Issues Releases Wiki Activity

Merge pull request #5 from lexmag/remove-app-sup

Browse source 
No need in `HTTParrot.Supervisor` file
This commit is contained in:
Eduardo Gurgel 2014-11-03 13:04:13 +13:00
commit 4b1d52d92d
2 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/httparrot.ex
View file

@ -31,22 +31,25 @@ defmodule HTTParrot do
{'/image', HTTParrot.ImageHandler, []}, {'/image', HTTParrot.ImageHandler, []},
{'/websocket', HTTParrot.WebsocketHandler, []} ] } {'/websocket', HTTParrot.WebsocketHandler, []} ] }
]) ])
{:ok, http_port} = :application.get_env(:httparrot, :http_port)
ssl = :application.get_env(:httparrot, :ssl, false)
{:ok, _} = :cowboy.start_http(:http, 100, [port: http_port],
[env: [dispatch: dispatch], onresponse: &prettify_json/4])
if ssl do {:ok, http_port} = Application.fetch_env(:httparrot, :http_port)
{:ok, https_port} = :application.get_env(:httparrot, :https_port) IO.puts "Starting HTTParrot on port #{http_port}"
{:ok, _} = :cowboy.start_http(:http, 100,
[port: http_port],
[env: [dispatch: dispatch],
onresponse: &prettify_json/4])
if Application.get_env(:httparrot, :ssl, false) do
{:ok, https_port} = Application.fetch_env(:httparrot, :https_port)
priv_dir = :code.priv_dir(:httparrot) priv_dir = :code.priv_dir(:httparrot)
IO.puts "Starting HTTParrot on port #{https_port} (SSL)"
{:ok, _} = :cowboy.start_https(:https, 100, {:ok, _} = :cowboy.start_https(:https, 100,
[port: https_port, cacertfile: priv_dir ++ '/ssl/server-ca.crt', [port: https_port, cacertfile: priv_dir ++ '/ssl/server-ca.crt',
certfile: priv_dir ++ '/ssl/server.crt', keyfile: priv_dir ++ '/ssl/server.key'], certfile: priv_dir ++ '/ssl/server.crt', keyfile: priv_dir ++ '/ssl/server.key'],
[env: [dispatch: dispatch], onresponse: &prettify_json/4]) [env: [dispatch: dispatch], onresponse: &prettify_json/4])
IO.puts "Starting HTTParrot on port #{https_port} (SSL)"
end end
IO.puts "Starting HTTParrot on port #{http_port}"
HTTParrot.Supervisor.start_link Supervisor.start_link([], strategy: :one_for_one)
end end
def stop(_State), do: :ok def stop(_State), do: :ok

12
lib/httparrot/supervisor.ex
View file

@ -1,12 +0,0 @@
defmodule HTTParrot.Supervisor do
use Supervisor
def start_link do
:supervisor.start_link({:local, __MODULE__}, __MODULE__, [])
end
def init([]) do
children = []
supervise children, strategy: :one_for_one
end
end