Permalink
Browse files

Merge branch 'heroku' of git://github.com/nisbus/monterl_carlo_websoc…

…ket into heroku

Conflicts:
	Procfile
	src/monterl_carlo_websocket.erl
  • Loading branch information...
2 parents c1460f4 + 933109f commit d5e07687b47e1f9e8706e6cb825bfe1f86921686 @archaelus archaelus committed Nov 2, 2012
Showing with 2 additions and 6 deletions.
  1. +1 −1 Procfile
  2. +1 −2 src/monterl_carlo_websocket.erl
  3. +0 −3 start.sh
View
@@ -1 +1 @@
-web: erl -pa ebin -env ERL_LIBS deps -s monterl_carlo_websocket -monterl_carlo_websocket http_port $PORT -noshell -noinput
+web: erl -pa ebin -env ERL_LIBS deps -s monterl_carlo_websocket -monterl_carlo_websocket http_port $PORT -noshell -noinput -boot start_sasl
@@ -44,8 +44,7 @@ start_phase(listen,_Type,_Args) ->
{file,<<"jquery.flot.js">>},
{mimetypes, [{<<".js">>, [<<"text/javascript">>]}]}]},
{'_', monterl_carlo_websocket_handler, []}
- ]}],
-
+ ]}],
cowboy:start_http(http, 100, [{port, config(http_port)}],[{dispatch, Dispatch}]),
ok.
View
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-exec erl -pa $PWD/ebin $PWD/deps/*/ebin -boot start_sasl -s monterl_carlo_websocket

0 comments on commit d5e0768

Please sign in to comment.