From 22875b2fbf6bb931bd2647d50208934322996820 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Fri, 20 Mar 2020 17:20:46 +0100
Subject: [PATCH] ENH: Logging names improved.
---
README_LOGGING.md => doc/devel/Logging.md | 7 ++++++-
.../caosdb/server/resource/transaction/EntityResource.java | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
rename README_LOGGING.md => doc/devel/Logging.md (92%)
diff --git a/README_LOGGING.md b/doc/devel/Logging.md
similarity index 92%
rename from README_LOGGING.md
rename to doc/devel/Logging.md
index e7b91bc7..f9b1680e 100644
--- a/README_LOGGING.md
+++ b/doc/devel/Logging.md
@@ -8,7 +8,12 @@ Note that some libraries on the classpath use the `java.util.logging` API and lo
## Configuration
-The configuration of the log4j2 backend is done via `properties` files which comply with the log4j2 specifications [1](https://logging.apache.org/log4j/2.x/manual/configuration.html#Properties). XML, YAML, or JSON files are not supported. The usual mechanisms for automatic configuratio with such files is disabled. Instead, files have to be placed into the `conf` subdirs, as follows:
+The configuration of the log4j2 backend is done via `properties` files which
+comply with the [log4j2
+specifications](https://logging.apache.org/log4j/2.x/manual/configuration.html#Properties).
+XML, YAML, or JSON files are not supported. The usual mechanisms for automatic
+configuration with such files is disabled. Instead, files have to be placed
+into the `conf` subdirs, as follows:
### Default and Debug Logging
diff --git a/src/main/java/caosdb/server/resource/transaction/EntityResource.java b/src/main/java/caosdb/server/resource/transaction/EntityResource.java
index 8dec9c00..dc25bcff 100644
--- a/src/main/java/caosdb/server/resource/transaction/EntityResource.java
+++ b/src/main/java/caosdb/server/resource/transaction/EntityResource.java
@@ -112,7 +112,7 @@ public class EntityResource extends AbstractCaosDBServerResource {
final long t2 = System.currentTimeMillis();
entityContainer
.getTransactionBenchmark()
- .addMeasurement(getClass().getSimpleName() + ".httpGetInChildClass.handle", t2 - t1);
+ .addMeasurement(getClass().getSimpleName() + ".httpGetInChildClass#handle", t2 - t1);
final Retrieve retrieve = new Retrieve(entityContainer);
retrieve.execute();
@@ -121,7 +121,7 @@ public class EntityResource extends AbstractCaosDBServerResource {
entityContainer
.getTransactionBenchmark()
.addMeasurement(
- getClass().getSimpleName() + ".httpGetInChildClass.retrieve.execute", t3 - t2);
+ getClass().getSimpleName() + ".httpGetInChildClass#retrieve.execute", t3 - t2);
final Element rootElem = generateRootElement();
entityContainer.addToElement(rootElem);
@@ -131,7 +131,7 @@ public class EntityResource extends AbstractCaosDBServerResource {
entityContainer
.getTransactionBenchmark()
.addMeasurement(
- getClass().getSimpleName() + ".httpGetInChildClass.element_handling", t4 - t3);
+ getClass().getSimpleName() + ".httpGetInChildClass#element_handling", t4 - t3);
return ok(doc);
}
--
GitLab