@@ -2,5 +2,7 @@ -include("responder_base.erl"). -compile(export_all). -provide_pool(_A) -> - resource_fountain:best_pool_for_details_match(details()). +% This responder can modify the request, and is obligated to return +% a pool and the request. You can just return it directly if you want. +provide_pool(A, _GC, _SC) -> + {resource_fountain:best_pool_for_details_match(details()), A}. elibs/frontend_responder.erl @@ -3,15 +3,10 @@ -include("../include/yaws/yaws.hrl"). -test() -> - ModuleFilePath = code:which(?MODULE), - DirPath = filename:dirname(ModuleFilePath), - yaws_begin_server(yaws_global_configs(9001, DirPath ++ "/../web")). +setup(Port, DocRoot, Responder) -> + yaws_begin_server(yaws_global_configs(Port, DocRoot, Responder)). -setup(Port, DocRoot) -> - yaws_begin_server(yaws_global_configs(Port, DocRoot)). - -yaws_global_configs(Port, DocRoot) -> +yaws_global_configs(Port, DocRoot, Responder) -> Y = yaws_config:yaws_dir(), GC = #gconf{yaws_dir = Y, ebin_dir = [], @@ -31,7 +26,7 @@ yaws_global_configs(Port, DocRoot) -> servername = "xle_responder", listen = {0,0,0,0}, docroot = DocRoot, - errormod_404 = frontend_responder, + errormod_404 = Responder, appmods = []}, {GC,SC}. elibs/frontend_yaws.erl @@ -22,13 +22,14 @@ init([]) -> Master = application:get_env(master), {ok, DocRoot} = application:get_env(docroot), {ok, Port} = application:get_env(port), + ResponderModule = figure_responder(), case Master of {ok, MasterNode} -> ping_master(MasterNode); undefined -> MasterNode = node() end, - frontend_yaws:setup(Port, DocRoot), + frontend_yaws:setup(Port, DocRoot, ResponderModule), {ok, {{one_for_one, 10, 600}, [{master_beater, {master_beater, start_link, [MasterNode, ?GLOBAL_TIMEOUT, ?SLEEP_CYCLE]}, @@ -52,3 +53,10 @@ ping_master(Node) -> ping_master(Node) end. +figure_responder() -> + case application:get_env(responder) of + {ok, Module} -> + Module; + undefined -> frontend_responder + end. + elibs/fuzed_frontend_supervisor.erl @@ -3,10 +3,9 @@ -include("fuzed.hrl"). -export([out404/3]). -out404(A, _GC, SC) -> +out404(Arg, GC, SC) -> + {Pool, A} = provide_pool(Arg, GC, SC), Parameters = [{request, {struct, parse_arg(A, SC)}}], - io:format("Param restructure:~n~p~n", [Parameters]), - Pool = provide_pool(A), case node_api:safely_send_call_to_pool_no_lookup(handle_request, Parameters, pure, include/responder_base.erl @@ -60,6 +60,10 @@ OptionParser.new do |opts| options[:port] = dir end + opts.on("-f", "--frontend-responder MODULE", "Module to use for Pool calculation.") do |mod| + options[:module] = mod + end + opts.on("-?", "--help", "Display arguments.") do puts opts exit(0) @@ -73,6 +77,11 @@ docroot = options[:docroot] || "/tmp" spec = options[:spec] || "kind=normal" details = details_from_string(spec) port = options[:port] || "8080" +mod = if options[:module] + "-fuzed_frontend responder #{options[:module]}" + else + "" + end if master !~ /@/ abort "Please specify fully qualified master node name e.g. -m master@fuzed.tools.powerset.com" @@ -90,6 +99,7 @@ cmd = %Q{erl -boot start_sasl \ -fuzed_frontend details #{details} \ -fuzed_frontend docroot '"#{docroot}"' \ -fuzed_frontend port #{port} \ + #{mod} \ -config '#{FUZED_ROOT}/conf/fuzed_base' \ -run fuzed_frontend start}.squeeze(' ') puts cmd rlibs/cli/frontend.rb fc71cc0e7fcfd4e09c6114963835356a9922bc64 David Fayram dfayram@gmail.com http://github.com/KirinDave/fuzed/commit/0f6b09930784a37191dea47fb2b19559e192e657 0f6b09930784a37191dea47fb2b19559e192e657 2008-05-11T20:03:17-07:00 2008-05-11T20:03:17-07:00 Making the responder module user-specifiable. 59bc030ea33e4f910ac7abbb67d6f62ec63aef78 David Fayram dfayram@gmail.com