TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Have the lighttpd server script report the actual ip to which the server is bound. Closes #2903.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3123 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Sam Stephenson 2005-11-21 06:19:25 +00:00
parent 9a37fd44cb
commit 2b6e2bfed7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@ -1,5 +1,7 @@
*SVN*
* Have the lighttpd server script report the actual ip to which the server is bound. #2903. [Adam]
* Add plugin library directories to the load path after the lib directory so that libraries in the lib directory get precedence. #2910. [james.adam@gmail.com]
* Make help for the console command more explicit about how to specify the desired environment in which to run the console. #2911. [anonymous]

9
railties/lib/commands/servers/lighttpd.rb
View File

@ -19,8 +19,11 @@
FileUtils.cp source, config_file
end
port = IO.read(config_file).scan(/^server.port\s*=\s*(\d+)/).first rescue 3000
puts "=> Rails application started on http://0.0.0.0:#{port}"
config = IO.read(config_file)
default_port, default_ip = 3000, '0.0.0.0'
port = config.scan(/^server.port\s*=\s*(\d+)/).first rescue default_port
ip = config.scan(/^server.bind\s*=\s*"([^"]+)"/).first rescue default_ip
puts "=> Rails application started on http://#{ip || default_ip}:#{port || default_port}"
tail_thread = nil
@ -53,4 +56,4 @@
trap(:INT) { exit }
`lighttpd #{!detach ? "-D " : ""}-f #{config_file}`
tail_thread.kill if tail_thread
tail_thread.kill if tail_thread