diff --git a/lib/warbler/web_server.rb b/lib/warbler/web_server.rb index 43d38d3f..d5dcab74 100644 --- a/lib/warbler/web_server.rb +++ b/lib/warbler/web_server.rb @@ -113,9 +113,10 @@ def add(jar) args4 = --config args5 = {{config}} args6 = {{warfile}} -props = jetty.home,org.eclipse.jetty.util.log.class +props = jetty.home,org.eclipse.jetty.util.log.class,org.eclipse.jetty.util.log.stderr.ESCAPE jetty.home = {{webroot}} org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StdErrLog +org.eclipse.jetty.util.log.stderr.ESCAPE = false PROPS end end diff --git a/spec/warbler/web_server_spec.rb b/spec/warbler/web_server_spec.rb index 88293a34..a890f991 100644 --- a/spec/warbler/web_server_spec.rb +++ b/spec/warbler/web_server_spec.rb @@ -61,10 +61,14 @@ def server = Warbler::JettyServer.new .each_line(chomp: true) .to_h { |line| line.split(' = ', 2) } - expect(props.keys.to_set).to eql Set.new(['mainclass', 'args', 'args0', 'args1', 'args2', 'args3', 'args4', 'args5', 'args6', 'props', 'jetty.home', 'org.eclipse.jetty.util.log.class']) + expect(props.keys.to_set).to eql Set.new( + ['mainclass', 'args', 'args0', 'args1', 'args2', 'args3', 'args4', 'args5', 'args6', 'props', 'jetty.home', + 'org.eclipse.jetty.util.log.class', 'org.eclipse.jetty.util.log.stderr.ESCAPE'] + ) expect(props['mainclass']).to eq 'org.eclipse.jetty.runner.Runner' - expect(props['props']).to eq 'jetty.home,org.eclipse.jetty.util.log.class' + expect(props['props']).to eq 'jetty.home,org.eclipse.jetty.util.log.class,org.eclipse.jetty.util.log.stderr.ESCAPE' expect(props['org.eclipse.jetty.util.log.class']).to eq 'org.eclipse.jetty.util.log.StdErrLog' + expect(props['org.eclipse.jetty.util.log.stderr.ESCAPE']).to eq 'false' end end \ No newline at end of file