bin/mongrel_rails in mongrel-0.3.12.4 vs bin/mongrel_rails in mongrel-0.3.13
- old
+ new
@@ -1,13 +1,13 @@
require 'rubygems'
require 'yaml'
require 'mongrel'
require 'mongrel/rails'
+require 'etc'
-
class Start < GemPlugin::Plugin "/commands"
include Mongrel::Command::Base
def configure
options [
@@ -15,21 +15,24 @@
["-d", "--daemonize", "Whether to run in the background or not", :@daemon, false],
['-p', '--port PORT', "Which port to bind to", :@port, 3000],
['-a', '--address ADDR', "Address to bind to", :@address, "0.0.0.0"],
['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"],
- ['-n', '--num-procs INT', "Number of processor threads to use", :@num_procs, 1024],
- ['-t', '--timeout SECONDS', "Timeout all requests after SECONDS time", :@timeout, 0],
+ ['-n', '--num-procs INT', "Number of processors active before clients denied", :@num_procs, 1024],
+ ['-t', '--timeout TIME', "Timeout all requests after 100th seconds time", :@timeout, 0],
['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, "public"],
['-B', '--debug', "Enable debugging mode", :@debug, false],
['-C', '--config PATH', "Use a config file", :@config_file, nil],
- ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil]
+ ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil],
+ ['-G', '--generate CONFIG', "Generate a config file for -C", :@generate, nil],
+ ['', '--user USER', "User to run as", :@user, nil],
+ ['', '--group GROUP', "Group to run as", :@group, nil]
]
end
-
+
def validate
@cwd = File.expand_path(@cwd)
valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
# change there to start, then we'll have to come back after daemonize
@@ -38,50 +41,69 @@
valid_dir? File.dirname(@log_file), "Path to log file not valid: #@log_file"
valid_dir? File.dirname(@pid_file), "Path to pid file not valid: #@pid_file"
valid_dir? @docroot, "Path to docroot not valid: #@docroot"
valid_exists? @mime_map, "MIME mapping file does not exist: #@mime_map" if @mime_map
valid_exists? @config_file, "Config file not there: #@config_file" if @config_file
+ valid_dir? File.dirname(@generate), "Problem accessing directory to #@generate" if @generate
+ valid_user? @user if @user
+ valid_group? @group if @group
+
return @valid
end
-
+
+
def run
# command line setting override config file settings
settings = { :host => @address, :port => @port, :cwd => @cwd,
:log_file => @log_file, :pid_file => @pid_file, :environment => @environment,
:docroot => @docroot, :mime_map => @mime_map, :daemon => @daemon,
- :debug => @debug, :includes => ["mongrel"], :config_script => @config_script
+ :debug => @debug, :includes => ["mongrel"], :config_script => @config_script,
+ :num_processors => @num_procs, :timeout => @timeout,
+ :user => @user, :group => @group
}
+ if @generate
+ STDERR.puts "** Writing config to #@generate"
+ open(@generate, "w") {|f| f.write(settings.to_yaml) }
+ STDERR.puts "## Exiting. Re-run without -G and WITH -C using your new config file."
+ exit 0
+ end
+
if @config_file
- STDERR.puts "** Loading settings from #{@config_file} (command line options override)."
+ STDERR.puts "** Loading settings from #{@config_file} (they override command line)." unless defaults[:daemon]
conf = YAML.load_file(@config_file)
- settings = conf.merge(settings)
+ settings = settings.merge! conf
end
-
+
config = Mongrel::Rails::RailsConfigurator.new(settings) do
- log "Starting Mongrel in #{defaults[:environment]} mode at #{defaults[:host]}:#{defaults[:port]}"
-
if defaults[:daemon]
- log "Daemonizing, any open files are closed. Look at #{defaults[:pid_file]} and #{defaults[:log_file]} for info."
+ if File.exist? defaults[:pid_file]
+ log "!!! PID file #{defaults[:pid_file]} already exists. Mongrel could be running already. Check your #{defaults[:log_file]} for errors."
+ end
+
daemonize
+ log "Daemonized, any open files are closed. Look at #{defaults[:pid_file]} and #{defaults[:log_file]} for info."
+ log "Settings loaded from #{@config_file} (they override command line)." if @config_file
end
-
+
+ log "Starting Mongrel listening at #{defaults[:host]}:#{defaults[:port]}"
+
listener do
mime = {}
if defaults[:mime_map]
log "Loading additional MIME types from #{defaults[:mime_map]}"
mime = load_mime_map(defaults[:mime_map], mime)
end
-
+
if defaults[:debug]
log "Installing debugging prefixed filters. Look in log/mongrel_debug for the files."
debug "/"
end
- log "Starting Rails in environment #{defaults[:environment]} ..."
- uri "/", :handler => rails
+ log "Starting Rails with #{defaults[:environment]} environment ..."
+ uri "/", :handler => rails(:mime => mime)
log "Rails loaded."
log "Loading any Rails specific GemPlugins"
load_plugins
@@ -94,10 +116,17 @@
end
end
config.run
config.log "Mongrel available at #{settings[:host]}:#{settings[:port]}"
+
+ if not @daemon
+ config.log "Use CTRL-C to stop."
+ else
+ config.write_pid_file
+ end
+
config.join
if config.needs_restart
if RUBY_PLATFORM !~ /mswin/
cmd = "ruby #{__FILE__} start #{original_args.join(' ')}"
@@ -116,37 +145,39 @@
begin
Process.kill(signal, pid)
rescue Errno::ESRCH
puts "Process does not exist. Not running."
end
-
+
puts "Done."
end
class Stop < GemPlugin::Plugin "/commands"
include Mongrel::Command::Base
def configure
options [
- ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
- ['-f', '--force', "Force the shutdown.", :@force, false],
- ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
+ ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
+ ['-f', '--force', "Force the shutdown.", :@force, false],
+ ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
]
end
-
+
def validate
- @cwd = File.expand_path(@cwd)
- valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+ if @cwd
+ @cwd = File.expand_path(@cwd)
+ valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+ @pid_file = File.join(@cwd,@pid_file)
+ end
- @pid_file = File.join(@cwd,@pid_file)
valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?"
return @valid
end
-
+
def run
if @force
send_signal("KILL", @pid_file)
else
send_signal("TERM", @pid_file)
@@ -159,21 +190,23 @@
class Restart < GemPlugin::Plugin "/commands"
include Mongrel::Command::Base
def configure
options [
- ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
- ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
- ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
+ ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
+ ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
+ ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"]
]
end
-
+
def validate
- @cwd = File.expand_path(@cwd)
- valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+ if @cwd
+ @cwd = File.expand_path(@cwd)
+ valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+ @pid_file = File.join(@cwd,@pid_file)
+ end
- @pid_file = File.join(@cwd,@pid_file)
valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?"
return @valid
end
@@ -190,10 +223,10 @@
GemPlugin::Manager.instance.load "mongrel" => GemPlugin::INCLUDE, "rails" => GemPlugin::EXCLUDE
if not Mongrel::Command::Registry.instance.run ARGV
- exit 1
+ exit 1
end