diff --git a/bootstrap/src/main/java/jetty/bootstrap/JettyBootstrap.java b/bootstrap/src/main/java/jetty/bootstrap/JettyBootstrap.java index 2f7d2d2..51a88b2 100644 --- a/bootstrap/src/main/java/jetty/bootstrap/JettyBootstrap.java +++ b/bootstrap/src/main/java/jetty/bootstrap/JettyBootstrap.java @@ -42,6 +42,12 @@ public class JettyBootstrap File warFile = new File(warLocation.toURI()); System.setProperty("org.eclipse.jetty.livewar.LOCATION",warFile.toPath().toRealPath().toString()); + // CB we want colorized output on linux + if (System.getProperty("os.name").equalsIgnoreCase("linux")) + { + System.setProperty("org.eclipse.jetty.logging.appender.MESSAGE_ESCAPE", "false"); + } + Class mainClass = Class.forName("org.jeudego.pairgoth.container.ServerMain",false,clWar); Method mainMethod = mainClass.getMethod("main",args.getClass()); mainMethod.invoke(mainClass,new Object[] { args }); diff --git a/webapp/src/main/kotlin/org/jeudego/pairgoth/web/ApiServlet.kt b/webapp/src/main/kotlin/org/jeudego/pairgoth/web/ApiServlet.kt index 0a850d7..7bcbdc7 100644 --- a/webapp/src/main/kotlin/org/jeudego/pairgoth/web/ApiServlet.kt +++ b/webapp/src/main/kotlin/org/jeudego/pairgoth/web/ApiServlet.kt @@ -102,7 +102,7 @@ class ApiServlet : HttpServlet() { } if (payload != null) { try { - logger.logPayload(green(">> "), payload, false) + logger.logPayload(">> ", payload, false) } catch (ioe: IOException) { } } diff --git a/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt b/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt index 7ca2d7f..60b2145 100644 --- a/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt +++ b/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt @@ -55,7 +55,7 @@ class WebappManager : ServletContextListener, ServletContextAttributeListener, H context.setAttribute("manager", this) webappRoot = context.getRealPath("/") try { - properties.load(context.getResourceAsStream("/WEB-INF/webapp.properties")) + properties.load(context.getResourceAsStream("/WEB-INF/pairgoth.properties")) val submaps: MutableMap> = HashMap() for (prop in properties.stringPropertyNames()) { val value = properties.getProperty(prop)