Merge pull request #589 from chadlwilson/fix-logging

fix: Log to stderr by default with default bundled Jetty 9.4

Author: chadlwilson

History.txt

@@ -1,6 +1,7 @@
 == Unreleased
 
 - fix: NullPointerException during shutdown with executable war files
+- fix: Jetty wars don't have console logging enabled by default
 
 == 2.1.0
 

lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

lib/warbler/web_server.rb

@@ -106,15 +106,16 @@ def add(jar)
       jar.files["WEB-INF/webserver.properties"] ||= StringIO.new(<<-PROPS)
 mainclass = org.eclipse.jetty.runner.Runner
 args = args0,args1,args2,args3,args4,args5,args6
-props = jetty.home
 args0 = --host
 args1 = {{host}}
 args2 = --port
 args3 = {{port}}
 args4 = --config
 args5 = {{config}}
 args6 = {{warfile}}
+props = jetty.home,org.eclipse.jetty.util.log.class
 jetty.home = {{webroot}}
+org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StdErrLog
 PROPS
     end
   end

spec/warbler/web_server_spec.rb

@@ -41,3 +41,30 @@ def self.reset_local_repository
   end
 
 end
+
+
+describe Warbler::JettyServer do
+
+  it "creates default configuration for jetty" do
+    files = {}
+    jar = double('jar file')
+    allow(jar).to receive(:files).and_return files
+
+    def server = Warbler::JettyServer.new
+
+    server.add(jar)
+    expect(files['WEB-INF/webserver.jar']).to match /org\/eclipse\/jetty\/jetty-runner\/9\.4.*\/jetty-runner-9\.4.*.jar/
+    expect(files['WEB-INF/webserver.xml'].string).to include 'org.eclipse.jetty.server.Server'
+
+    props = files['WEB-INF/webserver.properties']
+              .string
+              .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['mainclass']).to eq 'org.eclipse.jetty.runner.Runner'
+    expect(props['props']).to eq 'jetty.home,org.eclipse.jetty.util.log.class'
+    expect(props['org.eclipse.jetty.util.log.class']).to eq 'org.eclipse.jetty.util.log.StdErrLog'
+  end
+end