about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorluislavena <luislavena@19e92222-5c0b-0410-8929-a290d50e31e9>2006-02-20 19:00:49 +0000
committerluislavena <luislavena@19e92222-5c0b-0410-8929-a290d50e31e9>2006-02-20 19:00:49 +0000
commiteba148cef471ce85d5986246e3e6c5b2ae4a467a (patch)
treefc9ec389b3f4d2b031822448ab139f38a7deb880
parent93894b7f425f6bc22b81856d156a833d7e8dd742 (diff)
downloadunicorn-eba148cef471ce85d5986246e3e6c5b2ae4a467a.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@50 19e92222-5c0b-0410-8929-a290d50e31e9
-rw-r--r--Rakefile1
-rw-r--r--bin/mongrel_rails5
2 files changed, 3 insertions, 3 deletions
diff --git a/Rakefile b/Rakefile
index 9afee77..dd8cd63 100644
--- a/Rakefile
+++ b/Rakefile
@@ -46,7 +46,6 @@ task :win32_gem => [:clean, :compile, :test, :package_win32]
 
 task :package_win32 do
   setup_win32_gem(name, version,  version, summary, scripts, test_file) do |spec|
-    spec.add_dependency('daemons', '>= 0.4.2')
     spec.files << 'ext/http11/http11.so'
     spec.extensions = []
     spec.platform = Gem::Platform::WIN32
diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index cb891e1..ed391b1 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'mongrel'
-require 'daemons/daemonize'
 require 'mongrel/command'
 
 
@@ -77,7 +76,9 @@ class StartCommand < Mongrel::Command::Command
 
   def daemonize
     # save this for later since daemonize will hose it
-    if @daemon
+    if @daemon and RUBY_PLATFORM !~ /mswin/
+      require 'daemons/daemonize'
+
       puts "Started Mongrel server in #@environment mode at #@address:#@port"
       Daemonize.daemonize(log_file=File.join(@cwd, @log_file))