diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-21 22:10:32 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 22:10:32 -0800 |
| commit | 667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8 (patch) | |
| tree | 6ed040d81478b837b43286c386637fe95b4a0618 | |
| parent | 401b266f5fc1e6c5f13feb36122a1983989d8f58 (diff) | |
| parent | 7bfaa979e4e48dea68023e1aa67eabd160c3a7d3 (diff) | |
| download | rails-667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8.tar.gz rails-667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8.tar.bz2 rails-667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8.zip | |
Merge pull request #4125 from nashby/remove-process-daemon
remove Proces.daemon from core_ext
4 files changed, 0 insertions, 32 deletions
diff --git a/activesupport/lib/active_support/core_ext/process.rb b/activesupport/lib/active_support/core_ext/process.rb deleted file mode 100644 index 0b0bc6dc69..0000000000 --- a/activesupport/lib/active_support/core_ext/process.rb +++ /dev/null @@ -1 +0,0 @@ -require 'active_support/core_ext/process/daemon' diff --git a/activesupport/lib/active_support/core_ext/process/daemon.rb b/activesupport/lib/active_support/core_ext/process/daemon.rb deleted file mode 100644 index f5202ddee4..0000000000 --- a/activesupport/lib/active_support/core_ext/process/daemon.rb +++ /dev/null @@ -1,23 +0,0 @@ -module Process - def self.daemon(nochdir = nil, noclose = nil) - exit if fork # Parent exits, child continues. - Process.setsid # Become session leader. - exit if fork # Zap session leader. See [1]. - - unless nochdir - Dir.chdir "/" # Release old working directory. - end - - File.umask 0000 # Ensure sensible umask. Adjust as needed. - - unless noclose - STDIN.reopen "/dev/null" # Free file descriptors and - STDOUT.reopen "/dev/null", "a" # point them somewhere sensible. - STDERR.reopen '/dev/null', 'a' - end - - trap("TERM") { exit } - - return 0 - end unless respond_to?(:daemon) -end diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb index fc37ab84a3..fd59677d83 100644 --- a/activesupport/lib/active_support/ruby/shim.rb +++ b/activesupport/lib/active_support/ruby/shim.rb @@ -4,7 +4,6 @@ # Date next_year, next_month # DateTime to_date, to_datetime, xmlschema # Enumerable group_by, none? -# Process Process.daemon # REXML security fix # String ord # Time to_date, to_time, to_datetime @@ -12,7 +11,6 @@ require 'active_support' require 'active_support/core_ext/date/calculations' require 'active_support/core_ext/date_time/conversions' require 'active_support/core_ext/enumerable' -require 'active_support/core_ext/process/daemon' require 'active_support/core_ext/string/conversions' require 'active_support/core_ext/string/interpolation' require 'active_support/core_ext/string/encoding' diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile index 25d8f50a7b..1b467e1efd 100644 --- a/railties/guides/source/active_support_core_extensions.textile +++ b/railties/guides/source/active_support_core_extensions.textile @@ -3479,12 +3479,6 @@ Time.utc_time(1582, 10, 3) + 5.days # => Mon Oct 18 00:00:00 UTC 1582 </ruby> -h3. Extensions to +Process+ - -h4. +daemon+ - -Ruby 1.9 provides +Process.daemon+, and Active Support defines it for previous versions. It accepts the same two arguments, whether it should chdir to the root directory (default, true), and whether it should inherit the standard file descriptors from the parent (default, false). - h3. Extensions to +File+ h4. +atomic_write+ |