Permalink
Browse files

Have the lighttpd server script report the actual ip to which the ser…

…ver is bound. Closes #2903.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3123 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 9a37fd4 commit 2b6e2bfed79e30d6d72fcac6a068e9fcbbf4f610 @sstephenson sstephenson committed Nov 21, 2005
Showing with 8 additions and 3 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +6 −3 railties/lib/commands/servers/lighttpd.rb
View
@@ -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]
@@ -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

0 comments on commit 2b6e2bf

Please sign in to comment.