0
@@ -2,6 +2,8 @@
0
 -include("responder_base.erl").
0
 -compile(export_all).
0
 
0
-provide_pool(_A) ->
0
-  resource_fountain:best_pool_for_details_match(details()).
0
+% This responder can modify the request, and is obligated to return
0
+% a pool and the request. You can just return it directly if you want.
0
+provide_pool(A, _GC, _SC) ->
0
+  {resource_fountain:best_pool_for_details_match(details()), A}.

0
@@ -3,15 +3,10 @@
0
 -include("../include/yaws/yaws.hrl").
0
 
0
 
0
-test() -> 
0
-  ModuleFilePath = code:which(?MODULE),
0
-  DirPath = filename:dirname(ModuleFilePath),
0
-  yaws_begin_server(yaws_global_configs(9001, DirPath ++ "/../web")).
0
+setup(Port, DocRoot, Responder) ->
0
+  yaws_begin_server(yaws_global_configs(Port, DocRoot, Responder)).
0
 
0
-setup(Port, DocRoot) ->
0
-  yaws_begin_server(yaws_global_configs(Port, DocRoot)).
0
-
0
-yaws_global_configs(Port, DocRoot) -> 
0
+yaws_global_configs(Port, DocRoot, Responder) -> 
0
   Y = yaws_config:yaws_dir(),
0
   GC = #gconf{yaws_dir = Y,
0
               ebin_dir = [],
0
@@ -31,7 +26,7 @@
0
               servername = "xle_responder",
0
               listen = {0,0,0,0},
0
               docroot = DocRoot, 
0
-              errormod_404 = frontend_responder,
0
+              errormod_404 = Responder,
0
               appmods = []},
0
   {GC,SC}.
0
 

0
@@ -22,13 +22,14 @@
0
   Master = application:get_env(master),
0
   {ok, DocRoot} = application:get_env(docroot),
0
   {ok, Port} = application:get_env(port),
0
+  ResponderModule = figure_responder(),
0
   case Master of
0
     {ok, MasterNode} ->
0
       ping_master(MasterNode);
0
     undefined ->
0
       MasterNode = node()
0
   end,
0
-  frontend_yaws:setup(Port, DocRoot),
0
+  frontend_yaws:setup(Port, DocRoot, ResponderModule),
0
   {ok, {{one_for_one, 10, 600},
0
         [{master_beater,
0
           {master_beater, start_link, [MasterNode, ?GLOBAL_TIMEOUT, ?SLEEP_CYCLE]},
0
@@ -51,4 +52,12 @@
0
       timer:sleep(?SLEEP_CYCLE),
0
       ping_master(Node)
0
   end.
0
+
0
+figure_responder() ->
0
+  case application:get_env(responder) of
0
+    {ok, Module} ->
0
+      Module;
0
+    undefined -> frontend_responder
0
+  end.
0
+      

0
@@ -3,10 +3,9 @@
0
 -include("fuzed.hrl").
0
 -export([out404/3]).
0
 
0
-out404(A, _GC, SC) ->
0
+out404(Arg, GC, SC) ->
0
+  {Pool, A} = provide_pool(Arg, GC, SC),
0
   Parameters = [{request, {struct, parse_arg(A, SC)}}],
0
-  io:format("Param restructure:~n~p~n", [Parameters]),
0
-  Pool = provide_pool(A),
0
   case node_api:safely_send_call_to_pool_no_lookup(handle_request,
0
                                                    Parameters, 
0
                                                    pure,

0
@@ -60,6 +60,10 @@
0
     options[:port] = dir
0
   end
0
 
0
+  opts.on("-f", "--frontend-responder MODULE", "Module to use for Pool calculation.") do |mod|
0
+    options[:module] = mod
0
+  end
0
+
0
   opts.on("-?", "--help", "Display arguments.") do
0
     puts opts
0
     exit(0)
0
@@ -73,6 +77,11 @@
0
 spec = options[:spec] || "kind=normal"
0
 details = details_from_string(spec)
0
 port = options[:port] || "8080"
0
+mod = if options[:module]
0
+        "-fuzed_frontend responder #{options[:module]}"
0
+      else
0
+        ""
0
+      end
0
 
0
 if master !~ /@/
0
   abort "Please specify fully qualified master node name e.g. -m master@fuzed.tools.powerset.com"
0
@@ -90,6 +99,7 @@
0
              -fuzed_frontend details #{details} \
0
              -fuzed_frontend docroot '"#{docroot}"' \
0
              -fuzed_frontend port #{port} \
0
+             #{mod} \
0
              -config '#{FUZED_ROOT}/conf/fuzed_base' \
0
              -run fuzed_frontend start}.squeeze(' ')
0
 puts cmd