diff options
author | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-01-16 11:08:53 -0500 |
---|---|---|
committer | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-01-16 11:08:53 -0500 |
commit | cbb7f7d00484a7bd90cf95f7c76741c19042b7df (patch) | |
tree | 6832c99190d150c9b1bdb05794d59ecce3f9b89a /railties/lib | |
parent | 39f383bad01e52c217c9007b5e9d3b239fe6a808 (diff) | |
parent | 221b4aead579ebae28477e889a7ee68a6668b0fa (diff) | |
download | rails-cbb7f7d00484a7bd90cf95f7c76741c19042b7df.tar.gz rails-cbb7f7d00484a7bd90cf95f7c76741c19042b7df.tar.bz2 rails-cbb7f7d00484a7bd90cf95f7c76741c19042b7df.zip |
Merge pull request #23008 from tawan/avoid-multiple-default-paths
Avoid multiple default paths to server.pid file
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/commands/server.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 45d649ec31..27cbaf360a 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -6,6 +6,8 @@ require 'rails' module Rails class Server < ::Rack::Server class Options + DEFAULT_PID_PATH = File.expand_path("tmp/pids/server.pid").freeze + def parse!(args) args, options = args.dup, {} @@ -91,7 +93,7 @@ module Rails environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup, daemonize: false, caching: false, - pid: File.expand_path("tmp/pids/server.pid") + pid: Options::DEFAULT_PID_PATH }) end |