Ticket #422: server_thin_adapter.patch

lib/merb/server.rb

@@ -169 +169 @@
-            options[:fastcgi] = true
-          end
-          
+          opts.on("-t", "--thin", "Run merb using Thin Rack Adapter instead of mongrel.") do
+            options[:thin] = true
+          end
+          
-          opts.on("-X", "--mutex on/off", "This flag is for turning the mutex lock on and off.") do |mutex|
-            if mutex == 'off'
-              options[:use_mutex] = false
@@ -573 +577 @@
-          puts "Starting merb webrick server on port: #{@@merb_opts[:port]}"
-          trap('TERM') { exit }
-          webrick_start(@@merb_opts[:port])
+          exit!
-        end
-        
-        if @@merb_opts[:fastcgi] 
-          trap('TERM') { exit }
-          fastcgi_start
+          exit!
-        end
-        
+        if @@merb_opts[:thin]
+          puts "Starting merb thin server on port #{@@merb_opts[:port]}"
+          trap('TERM') { exit }
+          thin_start(@@merb_opts[:port])
+          exit!
+        end
-        
+        
-        if @@merb_opts[:cluster]
-          delete_pidfiles
-          @@merb_opts[:port].to_i.upto(@@merb_opts[:port].to_i+@@merb_opts[:cluster].to_i-1) do |port|
@@ -635 +648 @@
-        ::Rack::Handler::FastCGI.run Merb::Rack::Adapter.new
-      end
-      
+      def thin_start(port)
+        initialize_merb
+        require 'thin'
+        require 'merb/rack_adapter'
+        ::Rack::Handler::Thin.run Merb::Rack::Adapter.new, :Host => @@merb_opts[:host], :Port => port
+      end
+      
-      def delete_pidfiles(portor_star='*')
-        Dir["#{@@merb_opts[:merb_root]}/log/merb.#{portor_star}.pid"].each do |pid|
-          FileUtils.rm(pid)  rescue nil
@@ -657 +677 @@
-          puts @@merb_opts.to_yaml; puts
-        end
-        initialize_merb
-
+
-        mconf_hash = {:host => (@@merb_opts[:host]||"0.0.0.0"), :port => (port ||4000)}
-        if @@merb_opts[:user] and @@merb_opts[:group]
-          mconf_hash[:user]   = @@merb_opts[:user]