mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Consider MinGW as valid Windows platform.
This commit is contained in:
parent
7234d962f8
commit
11287600ce
2 changed files with 5 additions and 4 deletions
|
@ -6,6 +6,7 @@
|
||||||
* Ruby 1.9 early compatbility: Merged commits form Eric Wong.
|
* Ruby 1.9 early compatbility: Merged commits form Eric Wong.
|
||||||
* Better RubyGems support thanks to added env she-bang to mongrel_rails executable.
|
* Better RubyGems support thanks to added env she-bang to mongrel_rails executable.
|
||||||
* Fixed proper version reporting under 1.9
|
* Fixed proper version reporting under 1.9
|
||||||
|
* Consider MinGW as valid Windows platform.
|
||||||
|
|
||||||
=== 1.1.5 / 2008-05-22
|
=== 1.1.5 / 2008-05-22
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ module Mongrel
|
||||||
|
|
||||||
# Writes the PID file if we're not on Windows.
|
# Writes the PID file if we're not on Windows.
|
||||||
def write_pid_file
|
def write_pid_file
|
||||||
if RUBY_PLATFORM !~ /mswin/
|
if RUBY_PLATFORM !~ /mingw|mswin/
|
||||||
log "Writing PID file to #{@pid_file}"
|
log "Writing PID file to #{@pid_file}"
|
||||||
open(@pid_file,"w") {|f| f.write(Process.pid) }
|
open(@pid_file,"w") {|f| f.write(Process.pid) }
|
||||||
open(@pid_file,"w") do |f|
|
open(@pid_file,"w") do |f|
|
||||||
|
@ -185,7 +185,7 @@ module Mongrel
|
||||||
def daemonize(options={})
|
def daemonize(options={})
|
||||||
ops = resolve_defaults(options)
|
ops = resolve_defaults(options)
|
||||||
# save this for later since daemonize will hose it
|
# save this for later since daemonize will hose it
|
||||||
if RUBY_PLATFORM !~ /mswin/
|
if RUBY_PLATFORM !~ /mingw|mswin/
|
||||||
require 'daemons/daemonize'
|
require 'daemons/daemonize'
|
||||||
|
|
||||||
logfile = ops[:log_file]
|
logfile = ops[:log_file]
|
||||||
|
@ -366,7 +366,7 @@ module Mongrel
|
||||||
# clean up the pid file always
|
# clean up the pid file always
|
||||||
at_exit { remove_pid_file }
|
at_exit { remove_pid_file }
|
||||||
|
|
||||||
if RUBY_PLATFORM !~ /mswin/
|
if RUBY_PLATFORM !~ /mingw|mswin/
|
||||||
# graceful shutdown
|
# graceful shutdown
|
||||||
trap("TERM") { log "TERM signal received."; stop }
|
trap("TERM") { log "TERM signal received."; stop }
|
||||||
trap("USR1") { log "USR1 received, toggling $mongrel_debug_client to #{!$mongrel_debug_client}"; $mongrel_debug_client = !$mongrel_debug_client }
|
trap("USR1") { log "USR1 received, toggling $mongrel_debug_client to #{!$mongrel_debug_client}"; $mongrel_debug_client = !$mongrel_debug_client }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue