test/commands.txt @@ -1,3 +1,4 @@ test/app/log/*.log *~ \#* +erl_crash.dump .gitignore @@ -13,7 +13,6 @@ $:.unshift(CMD_LINE_PATH) DEFAULT_NODE_NAME = `hostname -s`.chomp + "-#{rand(9999)}" DEFAULT_MASTER_NODE = "master@fuzed-dev.powerset.com" -DEFAULT_REMOTE_RUBY = "http://fuzed-dev.powerset.com:9001/code" DEFAULT_ERLANG_CODEPATHS = %w[ebin/yaws ebin/eunit etest ebin] DEFAULT_BOOT_DIR = "/p/conf/fuzed/" bin/fuzed @@ -14,9 +14,10 @@ out404(A, _GC, SC) -> details()) of {result, R} -> convert_response(R); - {error, _R} -> + {error, R} -> + error_logger:info_msg("500 Internal Server Error: ~p~n", [R]), [{status, 500}, {html, "Sumpin fucked."}] - end. + end. parse_arg(Request, ServerOptions) -> Headers = Request#arg.headers, @@ -88,5 +89,6 @@ prep(A) -> A. details() -> {ok, Details} = - application:get_env(frontend, details), + application:get_env(fuzed_frontend, details), + error_logger:info_msg("Using frontend details ~p~n", [Details]), Details. elibs/frontend_responder.erl @@ -35,5 +35,8 @@ init([]) -> permanent, 10000, worker, [pool_sweeper]}, {fuzed_code_monitor, {fuzed_code_monitor, start_link, []}, - permanent, 10000, worker, [fuzed_code_monitor]} + permanent, 10000, worker, [fuzed_code_monitor]}, + {logger, + {logger, start_link, ["/var/log/fuzed"]}, + permanent, 10000, worker, [logger]} ]}}. elibs/fuzed_supervisor.erl @@ -1,11 +1,9 @@ def create_spec_list(options) spec_list = [] - result = "" - result.concat("/p/bin/xlew ") if options[:xlew] - result.concat("ruby -I/p/libexec/fuzed #{FUZED_ROOT + "/rlibs/pontoon.rb "}") - raise "You must specify an fuzed file to join the fuzed cluster!" unless options[:fuzedfile] + result = "ruby " + result.concat("-I#{FUZED_ROOT + "/rlibs "}") + raise "You must specify a fuzed file to join the fuzed cluster!" unless options[:fuzedfile] result.concat(options[:fuzedfile] + " ") - result.concat(%{#{options[:remote_ruby] || DEFAULT_REMOTE_RUBY} }) result.concat(%{--tags="#{options[:tags]}" }) if options[:tags] roles = [] roles << "production" if options[:production] @@ -27,7 +25,6 @@ OptionParser.new do |opts| opts.on("-z HOSTNAME", "--magic HOSTNAME", "Set smart details based off of a hostname") do |n| options[:master_name] = "master@#{n}" - options[:remote_ruby] = "http://#{n}:9001/code" end opts.on("-n NAME", "--name NAME", "Node name") do |n| @@ -54,15 +51,11 @@ OptionParser.new do |opts| options[:tags] = n end - opts.on("-x", "--xlew", "Make sure to run the node in the powerset nl environment") do |n| - options[:xlew] = true - end - opts.on("-d", "--detached", "Run as a daemon") do options[:detached] = true end - opts.on("-p", "--produciton", "Classify these nodes as production") do + opts.on("-p", "--production", "Classify these nodes as production") do options[:production] = true end @@ -73,10 +66,6 @@ OptionParser.new do |opts| opts.on("-i", "--inet", "Load code over internet via master code server") do options[:inet] = true end - - opts.on("--remote_ruby LOCATION", "Load Ruby code from the given URL or file location") do |x| - options[:remote_ruby] = x - end opts.on("-h", "--heartbeat", "Start with a heartbeat.") do $stderr.puts "WARNING! Heartbeats not supported with this build!" @@ -109,8 +98,6 @@ else "" end -remote_ruby = options[:remote_ruby] || DEFAULT_REMOTE_RUBY - cmd = %Q{erl -boot start_sasl \ #{detached} \ +Bc \ rlibs/cli/join.rb @@ -147,7 +147,7 @@ class RailsHandler < Chassis details("rails" => "default") - handle(:handle_request) do |args| + handle(:handle_request, :request) do |args| service(args[:request]) end end rlibs/rails_node.rb aac45964081d8d0ec8a423f1f536c722284ca91f Tom Preston-Werner tom@mojombo.com http://github.com/KirinDave/fuzed/commit/84159d727f2ae308bcb1518c66420e17e790bec7 84159d727f2ae308bcb1518c66420e17e790bec7 2008-05-04T20:33:26-07:00 2008-05-04T20:33:26-07:00 getting close to a full roundtrip 9f0a478b8f0ce7e87d821d0bd2c6c76ab993ebf1 Tom Preston-Werner tom@mojombo.com