Skip to content

Commit 33e7935

Browse files
committed
Upgraded jetty version to 10.0.1
1 parent adb1084 commit 33e7935

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
<httpcore.version>4.4.4</httpcore.version>
9393
<jackson.version>2.12.7</jackson.version>
9494
<jackson-databind.version>2.12.7.1</jackson-databind.version>
95-
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
96-
<jetty.version>9.4.50.v20221201</jetty.version>
95+
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
96+
<jetty.version>10.0.1</jetty.version>
9797
<junit.version>4.13.1</junit.version>
9898
<libthrift.version>0.9.3</libthrift.version>
9999
<kryo.version>4.0.2</kryo.version>

server/src/main/scala/org/apache/livy/server/WebServer.scala

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,14 @@ class WebServer(livyConf: LivyConf, var host: String, var port: Int) extends Log
9494

9595
// Configure the access log
9696
val requestLogHandler = new RequestLogHandler
97-
val requestLog = new NCSARequestLog(sys.env.getOrElse("LIVY_LOG_DIR",
98-
sys.env("LIVY_HOME") + "/logs") + "/yyyy_mm_dd.request.log")
99-
requestLog.setAppend(true)
100-
requestLog.setExtended(false)
101-
requestLog.setLogTimeZone("GMT")
102-
requestLog.setRetainDays(livyConf.getInt(LivyConf.REQUEST_LOG_RETAIN_DAYS))
97+
val logPath = sys.env.getOrElse("LIVY_LOG_DIR", sys.env("LIVY_HOME") + "/logs") + "/yyyy_mm_dd.request.log"
98+
val requestLogWriter = new RequestLogWriter(logPath)
99+
requestLogWriter.setAppend(true)
100+
requestLogWriter.setTimeZone("GMT")
101+
requestLogWriter.setRetainDays(livyConf.getInt(LivyConf.REQUEST_LOG_RETAIN_DAYS))
102+
103+
// Using NCSA Common Log format (without extended fields)
104+
val requestLog = new CustomRequestLog(requestLogWriter, CustomRequestLog.NCSA_FORMAT)
103105
requestLogHandler.setRequestLog(requestLog)
104106
handlers.addHandler(requestLogHandler)
105107

0 commit comments

Comments
 (0)