Merge pull request #594 from chadlwilson/disable-log-escaping

fix: disable escaping in Jetty logging for executable wars by default

Author: chadlwilson

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

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