From 2f049babd1ac067818b20a5643f70113ec1f3a4b Mon Sep 17 00:00:00 2001 From: zedshaw Date: Tue, 14 Mar 2006 05:48:37 +0000 Subject: mongrel_config now adapts to the platform it runs on and does either a win32 specific tool or a regular one, but with a similar interface. git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@109 19e92222-5c0b-0410-8929-a290d50e31e9 --- bin/mongrel_rails | 8 +++++++- bin/mongrel_rails_service | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/mongrel_rails b/bin/mongrel_rails index 0b48b1f..e66d99e 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -121,7 +121,13 @@ class Start < GemPlugin::Plugin "/commands" begin # start mongrel processing thread server.run - STDERR.puts "Server ready." + + if RUBY_PLATFORM !~ /mswin/ + puts "Server Ready. Use CTRL-C to quit." + else + puts "Server Ready. Use CTRL-Pause/Break to quit." + end + server.acceptor.join rescue Interrupt STDERR.puts "Interrupted." diff --git a/bin/mongrel_rails_service b/bin/mongrel_rails_service index 79fecdb..dd6c32b 100644 --- a/bin/mongrel_rails_service +++ b/bin/mongrel_rails_service @@ -30,7 +30,7 @@ module GenericCommand end end -class Install < Mongrel::Plugin "/commands" +class Install < GemPlugin::Plugin "/commands" include Mongrel::Command::Base # Default every option to nil so only the defined ones get passed to service @@ -174,7 +174,7 @@ class Install < Mongrel::Plugin "/commands" end end -class Delete < Mongrel::Plugin "/commands" +class Delete < GemPlugin::Plugin "/commands" include Mongrel::Command::Base include GenericCommand @@ -193,7 +193,7 @@ class Delete < Mongrel::Plugin "/commands" end end -class Start < Mongrel::Plugin "/commands" +class Start < GemPlugin::Plugin "/commands" include Mongrel::Command::Base include GenericCommand @@ -218,7 +218,7 @@ class Start < Mongrel::Plugin "/commands" end end -class Stop < Mongrel::Plugin "/commands" +class Stop < GemPlugin::Plugin "/commands" include Mongrel::Command::Base include GenericCommand -- cgit v1.2.3-24-ge0c7