Changeset 1000

Timestamp:

03/31/08 03:19:14 (5 months ago)

Author:

luislavena

Message:

Somehow the RUBY_PLATFORM regexp got lost between branches... great!
Added shebang to mongrel_rails (makes latest RubyGem? happier).

Files:

• branches/stable_1-2 (modified) (2 props)
• branches/stable_1-2/bin/mongrel_rails (modified) (2 diffs)
• branches/stable_1-2/lib/mongrel/configurator.rb (modified) (3 diffs)
• branches/stable_1-2/lib/mongrel/rails.rb (modified) (1 diff)

branches/stable_1-2/bin/mongrel_rails

@@ +1 @@
+#!/usr/bin/env ruby
+#
-# Copyright (c) 2005 Zed A. Shaw
-# You can redistribute it and/or modify it under the same terms as Ruby.
@@ -138 +140 @@
-
-      if config.needs_restart
-mswin
+djgpp|(cyg|ms|bcc)win|mingw
-          cmd = "ruby #{__FILE__} start #{original_args.join(' ')}"
-          config.log "Restarting with arguments:  #{cmd}"

branches/stable_1-2/lib/mongrel/configurator.rb

@@ -82 +82 @@
-    # Writes the PID file if we're not on Windows.
-    def write_pid_file
-mswin
+djgpp|(cyg|ms|bcc)win|mingw
-        log "Writing PID file to #{@pid_file}"
-        open(@pid_file,"w") {|f| f.write(Process.pid) }
@@ -186 +186 @@
-      ops = resolve_defaults(options)
-      # save this for later since daemonize will hose it
-mswin
+djgpp|(cyg|ms|bcc)win|mingw
-        require 'daemons/daemonize'
-
@@ -367 +367 @@
-      at_exit { remove_pid_file }
-
-mswin
+djgpp|(cyg|ms|bcc)win|mingw
-        # graceful shutdown
-        trap("TERM") { log "TERM signal received."; stop }

branches/stable_1-2/lib/mongrel/rails.rb

@@ -174 +174 @@
-        setup_signals(options)
-
-mswin
+djgpp|(cyg|ms|bcc)win|mingw
-          # rails reload
-          trap("HUP") { log "HUP signal received."; reload!          }