@@ -4,14 +4,17 @@ -include("fuzed.hrl"). -compile(export_all). +provide_pool(_A) -> + resource_fountain:best_pool_for_details_match(details()). + out404(A, _GC, SC) -> - Parameters = [{method, handle_request}, {request, {struct, parse_arg(A, SC)}}], + Parameters = [{request, {struct, parse_arg(A, SC)}}], io:format("Param restructure:~n~p~n", [Parameters]), - case node_api:safely_send_call_to_pool(handle_request, - Parameters, - {handle_request, {request}}, - pure, - details()) of + Pool = provide_pool(A), + case node_api:safely_send_call_to_pool_no_lookup(handle_request, + Parameters, + pure, + Pool) of {result, R} -> convert_response(R); {error, R} -> @@ -90,5 +93,4 @@ prep(A) -> A. details() -> {ok, Details} = application:get_env(fuzed_frontend, details), - error_logger:info_msg("Using frontend details ~p~n", [Details]), Details. elibs/frontend_responder.erl @@ -3,7 +3,7 @@ % Functional calls -export([parse_sentence/2, semrep_for_sentence/2, nlmatch_semreps/3, details/1, stop/1, heat/1, morphemes_for_sentence/2, api/1, api_signature/1, safely_send_call_to_pool/4, safely_send_call_to_pool/5, send_call/3, send_call/4, - heat/2]). + heat/2, safely_send_call_to_pool_no_lookup/4]). -include("fuzed.hrl"). @@ -30,14 +30,17 @@ safely_send_call_to_pool(Method, Parameters, ApiSpec, Details) -> % Valid retkinds are json and erlang safely_send_call_to_pool(Method, Parameters, ApiSpec, RetType, Details) -> PoolSearch = resource_fountain:pool_for_dispatch(ApiSpec, Details), + safely_send_call_to_pool_no_lookup(Method, Parameters, RetType, PoolSearch). + +safely_send_call_to_pool_no_lookup(Method, Parameters, RetType, Pool) -> Me = self(), - case PoolSearch of - none -> {error, ?NOPOOL_MSG ++ " in safely_send_call_to_pool."}; + case Pool of + none -> {error, ?NOPOOL_MSG ++ " in safely_send_call_to_pool_with_no_lookup."}; Pool when is_pid(Pool) -> Worker = spawn(fun() -> independent_pool_call(Pool, Method, Parameters, RetType, Me) end), receive {Worker, result, Result} -> Result - after ?GLOBAL_TIMEOUT -> {error, io_lib:format("Request took more than 1 minute. ApiSpec: ~p~nMethod: ~p~nParameters: ~p~n", [ApiSpec, Method, Parameters])} + after ?GLOBAL_TIMEOUT -> {error, io_lib:format("Request took more than 1 minute. Method: ~p~nParameters: ~p~n", [Method, Parameters])} end end. elibs/node_api.erl 6f4be433ed215bc983b5e4ac346b377c27c21b29 David Fayram dfayram@gmail.com http://github.com/KirinDave/fuzed/commit/eec6db84255ed74431ac2ecd1b7629306a697273 eec6db84255ed74431ac2ecd1b7629306a697273 2008-05-11T19:36:11-07:00 2008-05-11T19:36:11-07:00 Extracting the dispatch a little. f012d0769ded87c1bd7de431d93922cf2f756b74 David Fayram dfayram@gmail.com