From 980affbfe0bf06bf432bfe86ad28a7e44136961c Mon Sep 17 00:00:00 2001
From: Falco Duersch <github@falcoduersch.com>
Date: Fri, 6 Nov 2020 13:59:47 +0100
Subject: [PATCH] Jetty 11: Disable  log configuration via Gaffer for now and
 add FIXMEs

---
 .../gretty/GafferConfiguratorEx.groovy        |  2 ++
 .../groovy/org/akhikhl/gretty/Runner.groovy   | 12 ++++++-
 .../main/resources/grettyRunnerLogback.xml    | 32 +++++++++++++++++++
 .../gretty/ServletContainerConfig.groovy      |  4 +++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 libs/gretty-runner/src/main/resources/grettyRunnerLogback.xml

diff --git a/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/GafferConfiguratorEx.groovy b/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/GafferConfiguratorEx.groovy
index d07aced60..a5c585d04 100644
--- a/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/GafferConfiguratorEx.groovy
+++ b/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/GafferConfiguratorEx.groovy
@@ -24,6 +24,8 @@ import org.codehaus.groovy.control.CompilerConfiguration
  *
  * @author akhikhl
  */
+// FIXME #162 recent logback versions do not include GafferConfigurator
+// see also: remark in Runner.groovy, the only call site
 @CompileStatic(TypeCheckingMode.SKIP)
 class GafferConfiguratorEx extends GafferConfigurator {
 
diff --git a/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/Runner.groovy b/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/Runner.groovy
index 81c39fea0..dfe5f49bb 100644
--- a/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/Runner.groovy
+++ b/libs/gretty-runner/src/main/groovy/org/akhikhl/gretty/Runner.groovy
@@ -80,7 +80,17 @@ final class Runner {
     binding.logFileName = serverParams.logFileName
     binding.logDir = serverParams.logDir
     binding.grettyDebug = params.debug
-    new GafferConfiguratorEx(logCtx).run(binding, logbackConfigText)
+    // FIXME #162 logback has temporarily suspended GafferConfigurator.
+    // We do not know if and when it will come back, see news of 2019-10-11:
+    // http://logback.qos.ch/news.html
+    // new GafferConfiguratorEx(logCtx).run(binding, logbackConfigText)
+    // Instead we use a fixed configuration file, which does not respect all the different
+    // logging toggles in Gretty:
+    Runner.class.getResource('/grettyRunnerLogback.xml').withInputStream {
+      JoranConfigurator configurator = new JoranConfigurator();
+      configurator.setContext(logCtx)
+      configurator.doConfigure(it)
+    }
   }
 
   private static Level stringToLoggingLevel(String str) {
diff --git a/libs/gretty-runner/src/main/resources/grettyRunnerLogback.xml b/libs/gretty-runner/src/main/resources/grettyRunnerLogback.xml
new file mode 100644
index 000000000..d98b4d890
--- /dev/null
+++ b/libs/gretty-runner/src/main/resources/grettyRunnerLogback.xml
@@ -0,0 +1,32 @@
+<!--
+  FIXME #162
+  This is a cheap replacement for the Gaffer configuration.
+  It should never ship.
+  Either Logback integrates the Gaffer configuration again,
+  or we find another solution to programmatic configuration
+  of Logback.
+-->
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.apache.catalina" level="WARN" />
+  <logger name="org.apache.coyote" level="WARN" />
+  <logger name="org.apache.jasper" level="WARN" />
+  <logger name="org.apache.tomcat" level="WARN" />
+  <logger name="org.eclipse.jetty" level="WARN" />
+
+  <logger name="org.eclipse.jetty.annotations.AnnotationConfiguration" level="ERROR" />
+  <logger name="org.eclipse.jetty.annotations.AnnotationParser" level="ERROR" />
+  <logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR" />
+
+  <logger name="org.akhikhl.gretty" level="DEBUG" />
+
+  <root level="debug">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy b/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy
index 5dff6878b..541be8695 100644
--- a/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy
+++ b/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy
@@ -71,6 +71,10 @@ class ServletContainerConfig {
           def asm_version = project.ext.asmVersion
           force "org.ow2.asm:asm:$asm_version"
           force "org.ow2.asm:asm-commons:$asm_version"
+
+          // FIXME #162 make Tomcat and Jetty agree on a common version of logback again?
+          force 'ch.qos.logback:logback-classic:1.3.0-alpha5'
+          force 'org.slf4j:slf4j-api:2.0.0-alpha1'
         }
       },
       servletApiVersion: { project -> project.ext.jetty11ServletApiVersion },