Remove jRuby hacks
This commit is contained in:
parent
d04a8b5052
commit
dd8391be93
4 changed files with 11 additions and 21 deletions
|
@ -226,13 +226,10 @@ module Middleman
|
|||
|
||||
app_class = options[:app] ||= ::Middleman.server.inst
|
||||
opts[:app] = app_class
|
||||
opts[:server] = if ::Middleman::JRUBY
|
||||
'webrick' # Maybe Kirk?
|
||||
else
|
||||
require "thin"
|
||||
::Thin::Logging.silent = !options[:logging]
|
||||
'thin'
|
||||
end
|
||||
|
||||
require "thin"
|
||||
::Thin::Logging.silent = !options[:logging]
|
||||
opts[:server] = 'thin'
|
||||
|
||||
server = ::Rack::Server.new(opts)
|
||||
server.start
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# Built on Rack
|
||||
require "rack"
|
||||
require "rack/file"
|
||||
|
||||
# Using Tilt for templating
|
||||
require "tilt"
|
||||
|
|
|
@ -45,12 +45,7 @@ module Guard
|
|||
|
||||
# Start Middleman in a fork
|
||||
def start
|
||||
if ::Middleman::JRUBY
|
||||
thread = Thread.new { bootup }
|
||||
thread.join
|
||||
else
|
||||
@server_job = fork { bootup }
|
||||
end
|
||||
@server_job = fork { bootup }
|
||||
end
|
||||
|
||||
def bootup
|
||||
|
@ -73,12 +68,9 @@ module Guard
|
|||
# Stop the forked Middleman
|
||||
def stop
|
||||
puts "== The Middleman is shutting down"
|
||||
if ::Middleman::JRUBY
|
||||
else
|
||||
Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
|
||||
Process.wait @server_job
|
||||
@server_job = nil
|
||||
end
|
||||
Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
|
||||
Process.wait @server_job
|
||||
@server_job = nil
|
||||
end
|
||||
|
||||
# Simply stop, then start
|
||||
|
|
Loading…
Reference in a new issue