lib/thin/controller.rb lib/thin/runner.rb @@ -1,168 +1,6 @@ #!/usr/bin/env ruby -# <tt>thin start</tt>: Starts the Rails app in the current directory. +# Thin command line interface script. # Run <tt>thin -h</tt> to get more usage. require File.dirname(__FILE__) + '/../lib/thin' -require 'optparse' -require 'yaml' -COMMANDS = %w(start stop restart config) - -# Default options values -options = { - :chdir => Dir.pwd, - :environment => 'development', - :address => '0.0.0.0', - :port => 3000, - :timeout => 60, - :log => 'log/thin.log', - :pid => 'tmp/pids/thin.pid', - :servers => 1 # no cluster -} - -# NOTE: If you add an option here make sure the key in the +options+ hash is the -# same as the name of the command line option. -# +option+ keys are use to build the command line to launch a cluster, -# see <tt>lib/thin/cluster.rb</tt>. -opts = OptionParser.new do |opts| - opts.banner = "Usage: thin [options] #{COMMANDS.join('|')}" - - opts.separator "" - opts.separator "Server options:" - - opts.on("-a", "--address HOST", "bind to HOST address (default: 0.0.0.0)") { |host| options[:address] = host } - opts.on("-p", "--port PORT", "use PORT (default: 3000)") { |port| options[:port] = port.to_i } - opts.on("-S", "--socket PATH", "bind to unix domain socket") { |file| options[:socket] = file } - opts.on("-e", "--environment ENV", "Rails environment (default: development)") { |env| options[:environment] = env } - opts.on("-c", "--chdir PATH", "Change to dir before starting") { |dir| options[:chdir] = File.expand_path(dir) } - opts.on("-t", "--timeout SEC", "Request or command timeout in sec", - "(default: #{options[:timeout]})") { |sec| options[:timeout] = sec.to_i } - opts.on( "--prefix PATH", "Mount the app under PATH (start with /)") { |path| options[:prefix] = path } - opts.on( "--stats PATH", "Mount the Stats adapter under PATH") { |path| options[:stats] = path } - - opts.separator "" - opts.separator "Daemon options:" - - opts.on("-d", "--daemonize", "Run daemonized in the background") { options[:daemonize] = true } - opts.on("-l", "--log FILE", "File to redirect output", - "(default: #{options[:log]})") { |file| options[:log] = file } - opts.on("-P", "--pid FILE", "File to store PID", - "(default: #{options[:pid]})") { |file| options[:pid] = file } - opts.on("-u", "--user NAME", "User to run daemon as (use with -g)") { |user| options[:user] = user } - opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)") { |group| options[:group] = group } - - opts.separator "" - opts.separator "Cluster options:" - - opts.on("-s", "--servers NUM", "Number of servers to start", - "set a value >1 to start a cluster") { |num| options[:servers] = num.to_i } - opts.on("-o", "--only NUM", "Send command to only one server of the cluster") { |only| options[:only] = only } - opts.on("-C", "--config PATH", "Load options from a config file") { |file| options[:config] = file } - - opts.separator "" - opts.separator "Common options:" - - opts.on_tail("-D", "--debug", "Set debbuging on") { $DEBUG = true } - opts.on_tail("-V", "--trace", "Set tracing on") { $TRACE = true } - opts.on_tail("-h", "--help", "Show this message") { puts opts; exit } - opts.on_tail('-v', '--version', "Show version") { puts Thin::SERVER; exit } -end - - -# == Utilities - -def cluster?(options) - options[:only] || (options[:servers] && options[:servers] > 1) -end - -def load_options_from_config_file!(options) - if file = options.delete(:config) - YAML.load_file(file).each { |key, value| options[key.to_sym] = value } - end -end - - -# == Commands definitions - -def start(options) - load_options_from_config_file! options - - if cluster?(options) - Thin::Cluster.new(options).start - else - if options[:socket] - server = Thin::Server.new(options[:socket]) - else - server = Thin::Server.new(options[:address], options[:port]) - end - - server.pid_file = options[:pid] - server.log_file = options[:log] - server.timeout = options[:timeout] - - if options[:daemonize] - server.daemonize - server.change_privilege options[:user], options[:group] if options[:user] && options[:group] - end - - server.app = Rack::Adapter::Rails.new(options.merge(:root => options[:chdir])) - - # If a prefix is required, wrap in Rack URL mapper - server.app = Rack::URLMap.new(options[:prefix] => server.app) if options[:prefix] - - # If a stats are required, wrap in Stats adapter - server.app = Thin::Stats::Adapter.new(server.app, options[:stats]) if options[:stats] - - # Register restart procedure - server.on_restart { Thin::Command.run(:start, options) } - - server.start - end -end - -def stop(options) - load_options_from_config_file! options - - if cluster?(options) - Thin::Cluster.new(options).stop - else - Thin::Server.kill(options[:pid], options[:timeout]) - end -end - -def restart(options) - load_options_from_config_file! options - - if cluster?(options) - Thin::Cluster.new(options).restart - else - Thin::Server.restart(options[:pid]) - end -end - -def config(options) - config_file = options.delete(:config) || abort('config option required') - - # Stringify keys - options.keys.each { |o| options[o.to_s] = options.delete(o) } - - File.open(config_file, 'w') { |f| f << options.to_yaml } - puts "Wrote configuration to #{config_file}" -end - - -# == Runs the command - -opts.parse! ARGV -command = ARGV[0] - -Dir.chdir(options[:chdir]) - -if COMMANDS.include?(command) - send(command, options) -elsif command.nil? - puts "Command required" - puts opts - exit 1 -else - abort "Invalid command : #{command}" -end +Thin::Runner.new(ARGV).run! \ No newline at end of file bin/thin @@ -14,11 +14,13 @@ module Thin autoload :Cluster, 'thin/cluster' autoload :Command, 'thin/command' autoload :Connection, 'thin/connection' + autoload :Controller, 'thin/controller' autoload :Daemonizable, 'thin/daemonizing' autoload :Logging, 'thin/logging' autoload :Headers, 'thin/headers' autoload :Request, 'thin/request' autoload :Response, 'thin/response' + autoload :Runner, 'thin/runner' autoload :Server, 'thin/server' autoload :Stats, 'thin/stats' end lib/thin.rb @@ -3,25 +3,15 @@ module Thin # * Generate start and stop commands and run them. # * Inject the port or socket number in the pid and log filenames. # Servers are started throught the +thin+ command-line script. - class Cluster - include Logging - - # Path to the +thin+ script used to control the servers. - # Leave this to default to use the one in the path. - attr_accessor :script - + class Cluster < Controller # Number of servers in the cluster. attr_accessor :size - - # Command line options passed to the thin script - attr_accessor :options - + # Create a new cluster of servers launched using +options+. def initialize(options) @options = options.merge(:daemonize => true) @size = @options.delete(:servers) @only = @options.delete(:only) - @script = $PROGRAM_NAME if socket @options.delete(:address) lib/thin/cluster.rb @@ -3,14 +3,16 @@ module Thin class Command include Logging - # Path to the +thin+ script used to control the servers. - # Leave this to default to use the one in the path. - attr_accessor :script + class << self + # Path to the +thin+ script used to control the servers. + # Leave this to default to use the one in the path. + attr_accessor :script + @script = $PROGRAM_NAME + end def initialize(name, options={}) @name = name @options = options - @script = $PROGRAM_NAME end def self.run(*args) @@ -34,7 +36,7 @@ module Thin else "--#{name.to_s.tr('_', '-')}=#{value.inspect}" end end - "#{@script} #{@name} #{shellified_options.compact.join(' ')}" + "#{self.class.script} #{@name} #{shellified_options.compact.join(' ')}" end end end \ No newline at end of file lib/thin/command.rb @@ -10,7 +10,6 @@ describe Cluster, "with host and port" do :log => 'thin.log', :pid => 'thin.pid' ) - @cluster.script = File.dirname(__FILE__) + '/../bin/thin' @cluster.silent = true end @@ -60,7 +59,6 @@ describe Cluster, "with UNIX socket" do :log => 'thin.log', :pid => 'thin.pid' ) - @cluster.script = File.dirname(__FILE__) + '/../bin/thin' @cluster.silent = true end @@ -111,7 +109,6 @@ describe Cluster, "controlling only one server" do :pid => 'thin.pid', :only => 3001 ) - @cluster.script = File.dirname(__FILE__) + '/../bin/thin' @cluster.silent = true end spec/cluster_spec.rb @@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/spec_helper' describe Command do before do @command = Command.new(:start, :port => 3000, :daemonize => true, :log => 'hi.log', :pid => nil) - @command.script = File.dirname(__FILE__) + '/../bin/thin' @command.silent = true end spec/command_spec.rb @@ -11,6 +11,7 @@ require 'socket' include Thin FileUtils.mkdir_p File.dirname(__FILE__) + '/../log' +Command.script = File.dirname(__FILE__) + '/../bin/thin' class TestRequest < Thin::Request def initialize(path, verb='GET', params={}) spec/spec_helper.rb 2a7e1025d3e119720dac8fe61df82d2e19fb8434 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/401ade74083354c0a180324a00d18c50e7c5f88c 401ade74083354c0a180324a00d18c50e7c5f88c 2008-02-01T20:43:41-08:00 2008-02-01T20:43:41-08:00 Refactoring thin script in several classes: * Runner: main CLI runner, parse options and send the command to the controller. * Controller: Configure and control a server or cluster (Cluster class now inherits from Controller). 7e330c734283629bc53547d1d69409620916abb3 macournoyer macournoyer@gmail.com