deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor cleanup of 1a23ab3938

Browse source
This commit is contained in:
Ben Hollis 2015-05-08 08:36:43 -07:00
parent 6afda2a34c
commit 28498b2fbe
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
middleman-core/lib/middleman-core/preview_server.rb
View file

@ -211,17 +211,15 @@ module Middleman
http_opts[:Logger] = ::WEBrick::Log.new(nil, 0) http_opts[:Logger] = ::WEBrick::Log.new(nil, 0)
end end
attempts_left = 4
tried_ports = []
begin begin
tries ||= 4
tried_ports ||= []
::WEBrick::HTTPServer.new(http_opts) ::WEBrick::HTTPServer.new(http_opts)
rescue Errno::EADDRINUSE rescue Errno::EADDRINUSE
tries -= 1 attempts_left -= 1
tried_ports << port tried_ports << port
if tries > 0 if attempts_left > 0
logger.error %(== Port #{port} is unavailable. Trying port #{port + 1} next.) logger.error %(== Port #{port} is unavailable. Trying port #{port + 1} next.)
@port += 1 @port += 1
@ -230,7 +228,8 @@ module Middleman
retry retry
end end
logger.error %(== Ports #{tried_ports.to_sentence} are unavailable. Either close the instances of "Middleman" already running on Ports #{tried_ports.to_sentence} or start this "Middleman"-instance on a another port with: "middleman server --port=#{port + 1}".) ports_sentence = tried_ports.to_sentence
logger.error %(== Ports #{ports_sentence} are unavailable. Either close the Middleman servers already running on ports #{ports_sentence} or start this Middleman server on a another port with: "middleman server --port=#{port + 1}".)
exit(1) exit(1)
end end