Browse files

Added Thin support to script/server. [#488 state:resolved]

  • Loading branch information...
1 parent 24c7f41 commit a93ea88c0623b4f65af98c0eb55924c335bb3ac1 @fluxin fluxin committed with jeremy Jun 25, 2008
Showing with 39 additions and 2 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +12 −2 railties/lib/commands/server.rb
  3. +25 −0 railties/lib/commands/servers/thin.rb
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*Edge*
+* Added Thin support to script/server. #488 [Bob Klosinski]
+
* Fix script/about in production mode. #370 [Cheah Chu Yeow, Xavier Noria, David Krmpotic]
* Add the gem load paths before the framework is loaded, so certain gems like RedCloth and BlueCloth can be frozen.
View
14 railties/lib/commands/server.rb
@@ -13,11 +13,19 @@
# Mongrel not available
end
+begin
+ require_library_or_gem 'thin'
+rescue Exception
+ # Thin not available
+end
+
server = case ARGV.first
- when "lighttpd", "mongrel", "new_mongrel", "webrick"
+ when "lighttpd", "mongrel", "new_mongrel", "webrick", "thin"
ARGV.shift
else
- if defined?(Mongrel)
+ if defined?(Thin)
+ "thin"
+ elsif defined?(Mongrel)
"mongrel"
elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
"lighttpd"
@@ -33,6 +41,8 @@
puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
when "mongrel", "new_mongrel"
puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)"
+ when "thin"
+ puts "=> Booting Thin (use 'script/server webrick' to force WEBrick)"
end
%w(cache pids sessions sockets).each { |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) }
View
25 railties/lib/commands/servers/thin.rb
@@ -0,0 +1,25 @@
+require 'rbconfig'
+require 'commands/servers/base'
+require 'thin'
+
+
+options = ARGV.clone
+options.insert(0,'start') unless Thin::Runner.commands.include?(options[0])
+
+thin = Thin::Runner.new(options)
+
+puts "=> Rails #{Rails.version} application starting on http://#{thin.options[:address]}:#{thin.options[:port]}"
+puts "=> Ctrl-C to shutdown server"
+
+log = Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath
+open(log, (File::WRONLY | File::APPEND | File::CREAT)) unless File.exist? log
+tail_thread = tail(log)
+trap(:INT) { exit }
+
+begin
+ thin.run!
+ensure
+ tail_thread.kill if tail_thread
+ puts 'Exiting'
+end
+

0 comments on commit a93ea88

Please sign in to comment.