lib/jstd-runner/server.rb in jstd-runner-0.0.6 vs lib/jstd-runner/server.rb in jstd-runner-0.0.7
- old
+ new
@@ -11,18 +11,19 @@
JAR = File.expand_path("../JsTestDriver-1.3.3d.jar", __FILE__)
LAUNCH_TIMEOUT = 120 # this is huge, but I've seen it happen
attr_reader :host, :port
- def initialize(port)
+ def initialize(port, jar = nil)
@host = "127.0.0.1"
@port = Integer(port)
@restarting = false
+ @jar = jar || JAR
end
def start
- Log.info "starting JsTestDriver"
+ Log.info "starting JsTestDriver from #{@jar}"
if immediate_poller.connected?
raise StartupError, "JsTestDriver already running on #{@host}:#{@port}"
end
@@ -34,11 +35,11 @@
end
end
def restart
@restarting = true
- Log.info "restaring server"
+ Log.info "restarting server"
stop rescue nil
@process = nil
start
@restarting = false
end
@@ -58,10 +59,10 @@
private
def process
@process ||= (
- proc = ChildProcess.new("java", "-jar", JAR, "--port", @port.to_s)
+ proc = ChildProcess.new("java", "-jar", @jar, "--port", @port.to_s)
proc.io.inherit! if $DEBUG
proc
)
end