README.md @@ -1,2 +1,2 @@ -{application, smoke_server_app, - [{mod, {smoke_server_app, []}}]}. \ No newline at end of file +{application, ernie_server_app, + [{mod, {ernie_server_app, []}}]}. \ No newline at end of file ebin/ernie_server_app.app @@ -2,7 +2,7 @@ -behaviour(gen_server). %% api --export([start_link/1, start/1, rpc/1, test/0]). +-export([start_link/1, start/1]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, @@ -32,10 +32,10 @@ start(Args) -> %% {stop, Reason} %% Description: Initiates the server %%-------------------------------------------------------------------- -init(Port) -> +init([Port, Handler]) -> process_flag(trap_exit, true), error_logger:info_msg("~p starting~n", [?MODULE]), - Ducky = port_wrapper:wrap("ducky"), + Ducky = port_wrapper:wrap(Handler), {ok, LSock} = try_listen(Port, 500), spawn(fun() -> loop(LSock, Ducky) end), {ok, #state{lsock = LSock, ducky = Ducky}}. elib/ernie_server.erl @@ -7,6 +7,9 @@ start_link() -> init([]) -> {ok, Port} = application:get_env(ernie_server_app, port), + io:format("Using port ~p~n", [Port]), + {ok, Handler} = application:get_env(ernie_server_app, handler), + io:format("Using handler ~p~n", [Handler]), case application:get_env(ernie_server_app, pidfile) of {ok, Location} -> Pid = os:getpid(), @@ -14,5 +17,5 @@ init([]) -> undefined -> ok end, {ok, {{one_for_one, 1, 60}, - [{ernie_server, {ernie_server, start_link, [Port]}, + [{ernie_server, {ernie_server, start_link, [[Port, Handler]]}, permanent, brutal_kill, worker, [ernie_server]}]}}. \ No newline at end of file elib/ernie_server_sup.erl @@ -20,6 +20,12 @@ OptionParser.new do |opts| end.parse! command = ARGV[0] +handler = ARGV[1] + +unless handler + puts "A handler must be specified: ernie /path/to/handler.rb" + exit(1) +end name = options[:name] || DEFAULT_NODE_NAME port = options[:port] || 8000 @@ -36,6 +42,7 @@ cmd = %Q{erl -boot start_sasl \ #{pidfile} \ -setcookie #{cookie_hash(name)} \ -ernie_server_app port #{port} \ + -ernie_server_app handler '"#{handler}"' \ -run ernie_server_app boot}.squeeze(' ') puts cmd exec(cmd) lib/cli/server.rb d37db253ac242e602e8447a3b51bb63cee61e0d5 Tom Preston-Werner tom@mojombo.com http://github.com/mojombo/ernie/commit/210fdd51292934dec8db0b1bcca11d798418c103 210fdd51292934dec8db0b1bcca11d798418c103 2009-05-18T16:15:19-07:00 2009-05-18T16:15:19-07:00 add handler cli param and fix up to actually work e75b54e9829b41a6649da7c85b2b19192fe3da83 Tom Preston-Werner tom@mojombo.com