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

Merge pull request #665 from techthumb/master

Browse source 
Changed log message when middleman starts.
This commit is contained in:
Ben Hollis 2012-11-11 18:01:15 -08:00
commit 4ef92481af
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,17 +6,18 @@ module Middleman
DEFAULT_PORT = 4567 DEFAULT_PORT = 4567
class << self class << self
attr_reader :app, :port attr_reader :app, :host, :port
delegate :logger, :to => :app delegate :logger, :to => :app
# Start an instance of Middleman::Application # Start an instance of Middleman::Application
# @return [void] # @return [void]
def start(opts={}) def start(opts={})
@options = opts @options = opts
@host = @options[:host] || Socket.gethostname
@port = @options[:port] || DEFAULT_PORT @port = @options[:port] || DEFAULT_PORT
mount_instance mount_instance
logger.info "== The Middleman is standing watch on port #{port}" logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
@initialized ||= false @initialized ||= false
unless @initialized unless @initialized
@ -56,7 +57,7 @@ module Middleman
unmount_instance unmount_instance
mount_instance mount_instance
logger.info "== The Middleman is standing watch on port #{port}" logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
end end
# Stop the current instance, exit Webrick # Stop the current instance, exit Webrick
@ -125,11 +126,9 @@ module Middleman
# Initialize webrick # Initialize webrick
# @return [void] # @return [void]
def setup_webrick(host, is_logging) def setup_webrick(is_logging)
@host = host
http_opts = { http_opts = {
:BindAddress => @host, :BindAddress => host,
:Port => port, :Port => port,
:AccessLog => [] :AccessLog => []
} }
@ -154,10 +153,7 @@ module Middleman
def mount_instance def mount_instance
@app = new_app @app = new_app
@webrick ||= setup_webrick( @webrick ||= setup_webrick(@options[:debug] || false)
@options[:host] || "0.0.0.0",
@options[:debug] || false
)
start_file_watcher start_file_watcher