elibs/frameworks/rails_framework.erl @@ -43,11 +43,12 @@ init([]) -> {ok, DocRoot} = application:get_env(docroot), SSL = ssl_config(), ResponderModule = figure_responder(), + FrameworkModule = figure_framework_module(), AppModSpecs = process_appmods(application:get_env(appmods)), case application:get_env(http_server) of - {ok, mochiweb} -> mochiweb_frontend:start(IP, Port, DocRoot, SSL, ResponderModule, AppModSpecs); - _ -> yaws_frontend:start(IP, Port, DocRoot, SSL, ResponderModule, AppModSpecs) + {ok, mochiweb} -> mochiweb_frontend:start(IP, Port, DocRoot, SSL, ResponderModule, FrameworkModule, AppModSpecs); + _ -> yaws_frontend:start(IP, Port, DocRoot, SSL, ResponderModule, FrameworkModule, AppModSpecs) end end, @@ -94,6 +95,12 @@ figure_responder() -> Module; undefined -> frontend_responder end. + +figure_framework_module() -> + {ok, Framework} = application:get_env(framework), + FrameworkString = atom_to_list(Framework), + FrameworkModuleString = FrameworkString ++ "_framework", + list_to_atom(FrameworkModuleString). process_appmods(undefined) -> []; process_appmods({ok, V}) -> V. \ No newline at end of file elibs/fuzed_frontend_supervisor.erl @@ -2,10 +2,10 @@ -module(mochiweb_frontend). -author("Abhay Kumar <abhay@opensynapse.net>"). --export([start/6]). +-export([start/7]). -export([request_loop/4]). -start(IP, Port, DocRoot, _SSL, ResponderModule, AppModSpecs) -> +start(IP, Port, DocRoot, _SSL, ResponderModule, _FrameworkModule, AppModSpecs) -> ReqLoopFun = fun(Req) -> ?MODULE:request_loop(Req, DocRoot, ResponderModule, AppModSpecs) end, mochiweb_http:start([{name, ?MODULE}, {ip, IP}, {port, Port}, {loop, ReqLoopFun}]). elibs/servers/mochiweb/mochiweb_frontend.erl @@ -1,9 +1,9 @@ -module(yaws_frontend). --export([start/6, start/1]). +-export([start/7, start/1]). -include("yaws.hrl"). -start(IP, Port, DocRoot, SSL, ResponderModule, AppModSpecs) -> - {GC, SC} = yaws_global_configs(IP, Port, DocRoot, SSL, ResponderModule, AppModSpecs), +start(IP, Port, DocRoot, SSL, ResponderModule, FrameworkModule, AppModSpecs) -> + {GC, SC} = yaws_global_configs(IP, Port, DocRoot, SSL, ResponderModule, FrameworkModule, AppModSpecs), application:set_env(yaws, embedded, true), application:start(yaws), yaws_api:setconf(GC, [[SC]]). @@ -39,7 +39,7 @@ yaws_gc() -> }, GC. -yaws_global_configs(IP, Port, DocRoot, SSL, ResponderModule, AppModSpecs) -> +yaws_global_configs(IP, Port, DocRoot, SSL, ResponderModule, FrameworkModule, AppModSpecs) -> {AppModModules, Opaques} = prepare_appmod_data(AppModSpecs), % io:format("DEBUG:~n~p~n---~n~p~n", [AppModModules, Opaques]), GC = yaws_gc(), @@ -48,6 +48,7 @@ yaws_global_configs(IP, Port, DocRoot, SSL, ResponderModule, AppModSpecs) -> listen = IP, docroot = DocRoot, errormod_404 = ResponderModule, + errormod_crash = FrameworkModule, appmods = AppModModules, opaque = Opaques}, case SSL of elibs/servers/yaws/yaws_frontend.erl @@ -52,6 +52,11 @@ OptionParser.new do |opts| options[:http_server] = server end + opts.on("--framework FRAMEWORK", "Framework to use. Choices are: rails") do |framework| + $stderr.puts "Unknown framework type. Using rails." unless %w[framework].include?(framework) + options[:framework] = framework + end + opts.on("--conf CONF", "Configuration file") do |conf| options[:conf] = conf end @@ -101,6 +106,7 @@ OptionParser.new do |opts| end.parse! http_server = options[:http_server] || DEFAULT_HTTP_SERVER +framework = options[:framework] || 'rails' detached = options[:detached] ? '-detached' : '' master = options[:master_name] || DEFAULT_MASTER_NODE nodename = options[:name] || DEFAULT_NODE_NAME @@ -165,6 +171,7 @@ else -fuzed_frontend http_server '#{http_server}' \ -fuzed_frontend details #{details} \ -fuzed_frontend docroot '"#{docroot}"' \ + -fuzed_frontend framework #{framework} \ #{ssl_details} \ -fuzed_frontend port #{port} \ #{fuzed_appspecs} \ rlibs/cli/frontend.rb @@ -109,6 +109,7 @@ cmd = %Q{erl -boot start_sasl \ -fuzed_node master "'#{master}'" \ -fuzed_node spec '#{spec}' \ -fuzed_node num_nodes #{num_nodes} \ + -fuzed_node framework 'rails' \ #{inet} \ -config '#{FUZED_ROOT}/conf/fuzed_base' \ -run fuzed_node start}.squeeze(' ') rlibs/cli/rails.rb @@ -41,6 +41,10 @@ class MainController < ApplicationController render :text => request.remote_ip.to_s end + def fail + raise "failboat" + end + protected def authenticate test/app/app/controllers/main_controller.rb b5ae846ccea12fd2b3c1a646449e9463c32c4e46 Tom Preston-Werner tom@mojombo.com http://github.com/KirinDave/fuzed/commit/e1f91c9bda7a3ee3f23074c28551196e0194a5f5 e1f91c9bda7a3ee3f23074c28551196e0194a5f5 2008-06-27T22:07:30-07:00 2008-06-27T21:56:40-07:00 support 500s for rails and introduce framework specific modules ce1ab13fa4a67925d9ac46c1d2d8d58b6ccef0ce Tom Preston-Werner tom@mojombo.com