Browse Source

Kettle Aufruf Java 17, REST Aufruf webapp-manager #10

master
Daniel Quathamer 9 hours ago
parent
commit
50d0d6b01f
  1. 2
      superx/WEB-INF/conf/edustore/db/bin/sx_kitchen.x
  2. 16
      superx/edit/kern/webapp_manager.jsp

2
superx/WEB-INF/conf/edustore/db/bin/sx_kitchen.x

@ -59,7 +59,7 @@ if [ -z "$JAVAMAXMEM" ]; then
fi fi
if [ -z "$PENTAHO_DI_JAVA_OPTIONS" ]; then if [ -z "$PENTAHO_DI_JAVA_OPTIONS" ]; then
PENTAHO_DI_JAVA_OPTIONS="-Xmx${JAVAMAXMEM}m" PENTAHO_DI_JAVA_OPTIONS="-Xmx${JAVAMAXMEM}m --add-opens java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.util.stream=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.math=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
fi fi
OPT="$PENTAHO_DI_JAVA_OPTIONS -cp $JDBC_CLASSPATH -DKETTLE_HOME=$KETTLE_HOME -DKETTLE_REPOSITORY=$KETTLE_REPOSITORY -DBI_KETTLE_PLUGIN_BASE_FOLDERS=$BI_KETTLE_PLUGIN_BASE_FOLDERS -DKETTLE_USER=$KETTLE_USER -DKETTLE_PASSWORD=$KETTLE_PASSWORD -DKETTLE_PLUGIN_PACKAGES=$KETTLE_PLUGIN_PACKAGES -DKETTLE_LOG_SIZE_LIMIT=$KETTLE_LOG_SIZE_LIMIT" OPT="$PENTAHO_DI_JAVA_OPTIONS -cp $JDBC_CLASSPATH -DKETTLE_HOME=$KETTLE_HOME -DKETTLE_REPOSITORY=$KETTLE_REPOSITORY -DBI_KETTLE_PLUGIN_BASE_FOLDERS=$BI_KETTLE_PLUGIN_BASE_FOLDERS -DKETTLE_USER=$KETTLE_USER -DKETTLE_PASSWORD=$KETTLE_PASSWORD -DKETTLE_PLUGIN_PACKAGES=$KETTLE_PLUGIN_PACKAGES -DKETTLE_LOG_SIZE_LIMIT=$KETTLE_LOG_SIZE_LIMIT"

16
superx/edit/kern/webapp_manager.jsp

@ -21,6 +21,7 @@ String platform=de.superx.servlet.SuperXManager.isHis1?"HISinOne":"SuperX";
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Webanwendung Manager</title> <title>Webanwendung Manager</title>
<link rel="stylesheet" href="../../style/bulma.css" /> <link rel="stylesheet" href="../../style/bulma.css" />
<link rel="stylesheet" href="../../style/bulma-tooltip.min.css" />
<script type="text/javascript" src="/superx/xml/js/memtext/sx_functions.js"></script> <script type="text/javascript" src="/superx/xml/js/memtext/sx_functions.js"></script>
</head> </head>
<script language="Javascript"> <script language="Javascript">
@ -72,14 +73,18 @@ async function TransletCacheRefresh()
async function Log4JReload() async function Log4JReload()
{ {
const url="../../ds/api/logs/reload_log4j"; const url="../../ds/api/logs/reload_log4j";
document.getElementById("LoggingReloadStatus").innerHTML="lade Logs";
try { try {
const response = await fetch(url,{method: "POST"}); const response = await fetch(url,{method: "POST", headers: {
"Content-Type": "application/json"
}});
if (!response.ok) { if (!response.ok) {
throw new Error(`Serverantwort: ${response.status}`); document.getElementById("LoggingReloadStatus").innerHTML = "FEHLER `${response.status}`";
} }
const cacheStatus = await response.text(); const logStatus = await response.text();
document.getElementById("LoggingReloadStatus").innerHTML = cacheStatus; document.getElementById("LoggingReloadStatus").innerHTML = logStatus;
} catch (error) { } catch (error) {
document.getElementById("LoggingReloadStatus").innerHTML = error.message; document.getElementById("LoggingReloadStatus").innerHTML = error.message;
} }
@ -475,6 +480,9 @@ if(tab.equals("log"))
</div> </div>
</div> </div>
</section> </section>
<button class="button has-tooltip-multiline has-tooltip-bottom" data-tooltip="Die Datei WEB-INF/log4j.properties neu einlesen"
onClick="Log4JReload();">Log-Konfiguration neu laden</button>
<span id="LoggingReloadStatus"></span>
<section class="section"> <section class="section">
<form name="log" > <form name="log" >
<div class="container" id="loadMask" > <div class="container" id="loadMask" >

Loading…
Cancel
Save