Skip to content

Upgraded jetty version to 10.0.1 #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
namanagraw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded jetty version to 10.0.1 #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
<httpcore.version>4.4.4</httpcore.version>
<jackson.version>2.12.7</jackson.version>
<jackson-databind.version>2.12.7.1</jackson-databind.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jetty.version>9.4.50.v20221201</jetty.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<jetty.version>10.0.1</jetty.version>
<junit.version>4.13.1</junit.version>
<libthrift.version>0.9.3</libthrift.version>
<kryo.version>4.0.2</kryo.version>
Expand Down
16 changes: 9 additions & 7 deletions server/src/main/scala/org/apache/livy/server/WebServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -131,4 +134,3 @@ class WebServer(livyConf: LivyConf, var host: String, var port: Int) extends Log
server.stop()
}
}

Loading