antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 8 Projects Releases 9 Wiki Activity Actions

Fix issue with modern Servlet API

Browse source
This commit is contained in:
Tobi Schäfer 2025-02-15 21:02:14 +01:00
parent c9853f6217
commit 12023e23e0
Signed by: tobi
GPG key ID: 91FAE6FE2EBAC4C8
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/Root/Root.js
View file

@ -254,9 +254,18 @@ Root.prototype.sitemap_xml_action = function() {
} }
Root.prototype.health_action = function() { Root.prototype.health_action = function() {
var jvm = java.lang.Runtime.getRuntime(); const jvm = java.lang.Runtime.getRuntime();
var totalMemory = jvm.totalMemory() / 1024 / 1024; const totalMemory = jvm.totalMemory() / 1024 / 1024;
var freeMemory = jvm.freeMemory() / 1024 / 1024; const freeMemory = jvm.freeMemory() / 1024 / 1024;
let servletApi;
try {
const getJavaClass = Packages.java.lang.Class.forName;
servletApi = getJavaClass('jakarta.servlet.Servlet');
} catch {
// Fall back to older Servlet API
servletApi = getJavaClass('javax.servlet.Servlet');
}
var param = { var param = {
uptime: formatNumber((new Date - app.upSince.getTime()) / Date.ONEDAY, '0.##'), uptime: formatNumber((new Date - app.upSince.getTime()) / Date.ONEDAY, '0.##'),
@ -270,7 +279,7 @@ Root.prototype.health_action = function() {
helmaCommitHash: Packages.helma.main.Server.server.commitHash, helmaCommitHash: Packages.helma.main.Server.server.commitHash,
jetty: Packages.org.eclipse.jetty.util.Jetty.VERSION, jetty: Packages.org.eclipse.jetty.util.Jetty.VERSION,
rhino: Packages.org.mozilla.javascript.ImplementationVersion.get(), rhino: Packages.org.mozilla.javascript.ImplementationVersion.get(),
servlet: Packages.java.lang.Class.forName('javax.servlet.Servlet').package.specificationVersion, servlet: servletApi.package.specificationVersion,
java: java.lang.System.getProperty('java.version') java: java.lang.System.getProperty('java.version')
}; };