From 8d9b59fe309efa80a4b98ef55b1a009d112d61d0 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Fri, 16 Aug 2013 14:54:07 +0200
Subject: [PATCH] OO-694 OO-695 display more info in admin site about olatdata
and current error count
---
.../olat/admin/sysinfo/ErrorSearchController.java | 10 +++++++++-
.../org/olat/admin/sysinfo/SysinfoController.java | 1 +
.../org/olat/admin/sysinfo/_content/errors.html | 14 +++++++++++++-
.../admin/sysinfo/_i18n/LocalStrings_de.properties | 4 +++-
.../admin/sysinfo/_i18n/LocalStrings_en.properties | 4 +++-
5 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/admin/sysinfo/ErrorSearchController.java b/src/main/java/org/olat/admin/sysinfo/ErrorSearchController.java
index a0f4dec964f..34dee5297ba 100644
--- a/src/main/java/org/olat/admin/sysinfo/ErrorSearchController.java
+++ b/src/main/java/org/olat/admin/sysinfo/ErrorSearchController.java
@@ -30,6 +30,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl;
+import org.olat.core.helpers.Settings;
import org.olat.core.logging.LogFileParser;
import org.olat.core.logging.Tracing;
import org.olat.core.util.StringHelper;
@@ -70,6 +71,14 @@ public class ErrorSearchController extends FormBasicController {
if(formLayout instanceof FormLayoutContainer) {
errorCont = createVelocityContainer("error_list");
((FormLayoutContainer)formLayout).put("errors", errorCont);
+
+ Long errCount = Tracing.getErrorCount();
+ String lastError = "-";
+ if (errCount > 0) {
+ String nodeId = StringHelper.containsNonWhitespace(Settings.getNodeInfo()) ? Settings.getNodeInfo() : "N1";
+ lastError = nodeId + "-E" + errCount;
+ }
+ ((FormLayoutContainer)formLayout).contextPut("highestError", lastError);
}
}
@@ -82,7 +91,6 @@ public class ErrorSearchController extends FormBasicController {
protected void formOK(UserRequest ureq) {
String errorNr = errorNumberEl.getValue();
Date date = dateChooserEl.getDate();
- errorCont.contextPut("highestError", Tracing.getErrorCount());
errorCont.contextPut("errormsgs", LogFileParser.getError(errorNr, date, true));
}
diff --git a/src/main/java/org/olat/admin/sysinfo/SysinfoController.java b/src/main/java/org/olat/admin/sysinfo/SysinfoController.java
index 50faf9de528..8f92857d365 100644
--- a/src/main/java/org/olat/admin/sysinfo/SysinfoController.java
+++ b/src/main/java/org/olat/admin/sysinfo/SysinfoController.java
@@ -178,6 +178,7 @@ public class SysinfoController extends FormBasicController {
baseDirPath = baseDir.getAbsolutePath();
}
uifactory.addStaticTextElement("sysinfo.basedir", "sysinfo.basedir", baseDirPath, serverCont);
+ uifactory.addStaticTextElement("sysinfo.olatdata", "sysinfo.olatdata", WebappHelper.getUserDataRoot(), serverCont);
}
private String getHeapValue() {
diff --git a/src/main/java/org/olat/admin/sysinfo/_content/errors.html b/src/main/java/org/olat/admin/sysinfo/_content/errors.html
index 34c372885b2..ab95424c457 100644
--- a/src/main/java/org/olat/admin/sysinfo/_content/errors.html
+++ b/src/main/java/org/olat/admin/sysinfo/_content/errors.html
@@ -1,4 +1,16 @@
<fieldset><legend>$r.translate("error.title")</legend>
-$r.render("fields")
+
+ <div class="b_form b_clearfix">
+ <div class="b_form_element_wrapper b_clearfix">
+ <div class="b_form_element_label">
+ <label>$r.translate("error.last")</label>
+ </div>
+ <div class="b_form_element">
+ $highestError
+ </div>
+ </div>
+ </div>
+
+ $r.render("fields")
</fieldset>
$r.render("errors")
diff --git a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
index ccd5a2fa8f7..41370704e24 100644
--- a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
@@ -14,6 +14,7 @@ core.functions=Funktions
core.webdav=WebDAV
core.jsMath=JS Math
core.restapi=REST API
+error.last=Letzter Fehler
error.date=Datum
error.format=(tt.mm.jjjj)
error.number=Fehlernummer
@@ -122,7 +123,8 @@ sysinfo.version=Version
sysinfo.version.hg=Mercurial Version
sysinfo.version.date=Build Datum
sysinfo.cluster=Cluster
-sysinfo.basedir=Wurzelordner
+sysinfo.basedir=Webapp Verzeichnis
+sysinfo.olatdata=Daten Verzeichnis
sysinfo.node=Node
runtime=Runtime Informationen
runtime.startup=System Start
diff --git a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
index 69af17452d1..7c3325fec5e 100644
--- a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
@@ -14,6 +14,7 @@ core.restapi=REST API
core.webdav=WebDAV
disable.hibernate.statistics=Disable hibernate statistics
enable.hibernate.statistics=Enable hibernate statistics
+error.last=Last error
error.date=Date
error.format=(dd.mm.yyyy)
error.number=Error number
@@ -142,7 +143,8 @@ sessionadministration.title=Session administration
sessions=Sessions
snoop=Snoop
sysinfo=System information
-sysinfo.basedir=Root folder
+sysinfo.basedir=Webapp directory
+sysinfo.olatdata=Data directory
sysinfo.cluster=Cluster
sysinfo.memory=Memory information
sysinfo.node=Node
--
GitLab