Ticket #5475: 2006-06-23-script_server_mongrel_server_support.diff

railties/lib/commands/server.rb

@@ -10 +10 @@
-server = case ARGV.first
-  when "lighttpd"
-    ARGV.shift
+  when "mongrel"
+    ARGV.shift
-  when "webrick"
-    ARGV.shift
-  else
-    if RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
-      "lighttpd"
+    elsif !silence_stderr { `mongrel_rails -v` }.blank?
+      "mongrel"
-    else
-      "webrick"
-    end
-end
-
-
-
-
-
+
+
+
+
+
+
+
-end
-
-['sessions', 'cache', 'sockets'].each { |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) }

railties/lib/commands/servers/mongrel.rb

@@ +1 @@
+require 'rbconfig'
+
+unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `mongrel_rails` }.blank?
+  puts "PROBLEM: Mongrel is not available on your system (or not in your path)"
+  exit 1
+end
+
+require 'optparse'
+
+detach = false
+ip = nil
+port = nil
+
+ARGV.options do |opt|
+  opt.on("-p", "--port=port", Integer,
+          "Runs Rails on the specified port.",
+          "Default: 3000") { |p| port = p }
+  opt.on("-b", "--binding=ip", String,
+          "Binds Rails to the specified ip.",
+          "Default: 0.0.0.0") { |i| ip = i }
+  opt.on('-h', '--help', 'Show this message.') { puts opt; exit 0 }
+  opt.on('-d', '-d', 'Call with -d to detach') { detach = true }
+  opt.parse!
+end
+
+default_port, default_ip = 3000, '0.0.0.0'
+puts "=> Rails application started on http://#{ip || default_ip}:#{port || default_port}"
+
+if !detach
+  puts "=> Call with -d to detach"
+  puts "=> Ctrl-C to shutdown server"
+  detach = false
+end
+
+trap(:INT) { exit }
+
+tail_thread = nil
+
+begin
+  `mongrel_rails start #{detach ? "-d " : ""} -p #{port || default_port} -a #{ip || default_ip}`
+ensure
+  unless detach
+    tail_thread.kill if tail_thread
+    puts 'Exiting'
+  end
+end