diff --git a/pom.xml b/pom.xml index 8c5e10503..986cecdb2 100644 --- a/pom.xml +++ b/pom.xml @@ -92,8 +92,8 @@ 4.4.4 2.12.7 2.12.7.1 - 3.1.0 - 9.4.50.v20221201 + 4.0.1 + 10.0.1 4.13.1 0.9.3 4.0.2 diff --git a/server/src/main/scala/org/apache/livy/server/WebServer.scala b/server/src/main/scala/org/apache/livy/server/WebServer.scala index e8306e545..6600e26fc 100644 --- a/server/src/main/scala/org/apache/livy/server/WebServer.scala +++ b/server/src/main/scala/org/apache/livy/server/WebServer.scala @@ -94,12 +94,15 @@ class WebServer(livyConf: LivyConf, var host: String, var port: Int) extends Log // Configure the access log val requestLogHandler = new RequestLogHandler - val requestLog = new NCSARequestLog(sys.env.getOrElse("LIVY_LOG_DIR", - sys.env("LIVY_HOME") + "/logs") + "/yyyy_mm_dd.request.log") - requestLog.setAppend(true) - requestLog.setExtended(false) - requestLog.setLogTimeZone("GMT") - requestLog.setRetainDays(livyConf.getInt(LivyConf.REQUEST_LOG_RETAIN_DAYS)) + val logPath = sys.env.getOrElse("LIVY_LOG_DIR", + sys.env("LIVY_HOME") + "/logs") + "/yyyy_mm_dd.request.log" + val requestLogWriter = new RequestLogWriter(logPath) + requestLogWriter.setAppend(true) + requestLogWriter.setTimeZone("GMT") + requestLogWriter.setRetainDays(livyConf.getInt(LivyConf.REQUEST_LOG_RETAIN_DAYS)) + + // Using NCSA Common Log format (without extended fields) + val requestLog = new CustomRequestLog(requestLogWriter, CustomRequestLog.NCSA_FORMAT) requestLogHandler.setRequestLog(requestLog) handlers.addHandler(requestLogHandler) @@ -131,4 +134,3 @@ class WebServer(livyConf: LivyConf, var host: String, var port: Int) extends Log server.stop() } } -