This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new c676913 SLING-12209 : Improve logging output
c676913 is described below
commit c6769135b79a24e67a13655222aa9ba15aca5554
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Thu Dec 21 16:13:41 2023 +0100
SLING-12209 : Improve logging output
---
.../apache/sling/feature/analyser/Analyser.java | 33 +++++++++++++++-------
.../sling/feature/analyser/package-info.java | 2 +-
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/analyser/Analyser.java
b/src/main/java/org/apache/sling/feature/analyser/Analyser.java
index 32b5cba..d561809 100644
--- a/src/main/java/org/apache/sling/feature/analyser/Analyser.java
+++ b/src/main/java/org/apache/sling/feature/analyser/Analyser.java
@@ -58,6 +58,8 @@ public class Analyser {
private final Map<String, Map<String, String>> configurations;
+ private boolean outputTaskDetails = true;
+
/**
* Create new analyser with a provided scanner and the tasks to run
*
@@ -150,6 +152,15 @@ public class Analyser {
this(scanner, getTasks());
}
+ /**
+ * Enable/disable output of task details. By default the details are
outputted.
+ * @param outputTaskDetails flag for enabling/disabling output of task
details
+ * @since 1.6.0
+ */
+ public void setOutputTaskDetails(final boolean outputTaskDetails) {
+ this.outputTaskDetails = outputTaskDetails;
+ }
+
/**
* Analyse the feature
*
@@ -186,7 +197,7 @@ public class Analyser {
throws Exception {
logger.info("Starting analyzing feature '{}'...", feature.getId());
- long start = System.currentTimeMillis();
+ final long start = System.currentTimeMillis();
final FeatureDescriptor featureDesc = scanner.scan(feature);
BundleDescriptor bd = null;
ArtifactId framework = fwk;
@@ -217,9 +228,10 @@ public class Analyser {
// execute analyser tasks
for (final AnalyserTask task : tasks) {
-
- logger.info("- Executing {} [{}]...", task.getName(),
task.getId());
- start = System.currentTimeMillis();
+ if (this.outputTaskDetails) {
+ logger.info("- Executing {} [{}]...", task.getName(),
task.getId());
+ }
+ final long startTask = System.currentTimeMillis();
final Map<String, String> taskConfiguration =
getConfiguration(task.getId());
task.execute(new AnalyserTaskContext() {
@@ -312,14 +324,15 @@ public class Analyser {
}
}
});
- logger.info("- Executed {} [{}] in {}ms", task.getName(),
task.getId(), System.currentTimeMillis() - start);
+ if (this.outputTaskDetails) {
+ logger.info("- Executed {} [{}] in {}ms", task.getName(),
task.getId(), System.currentTimeMillis() - startTask);
+ }
}
- int allWarnings = globalWarnings.size() + artifactWarnings.size() +
extensionWarnings.size() + configurationWarnings.size();
- int allErrors = globalErrors.size() + artifactErrors.size() +
extensionErrors.size() + configurationErrors.size();
- logger.info("Analyzing feature '" + feature.getId() + "' finished : "
- + allWarnings + " warnings, "
- + allErrors + " errors.");
+ final int allWarnings = globalWarnings.size() +
artifactWarnings.size() + extensionWarnings.size() +
configurationWarnings.size();
+ final int allErrors = globalErrors.size() + artifactErrors.size() +
extensionErrors.size() + configurationErrors.size();
+ logger.info("Finished analyzing feature '{}' in {}ms : {} warnings, {}
errors.",
+ feature.getId(), System.currentTimeMillis() - start, allWarnings,
allErrors);
return new AnalyserResult() {
@Override
diff --git a/src/main/java/org/apache/sling/feature/analyser/package-info.java
b/src/main/java/org/apache/sling/feature/analyser/package-info.java
index a1f0888..7356714 100644
--- a/src/main/java/org/apache/sling/feature/analyser/package-info.java
+++ b/src/main/java/org/apache/sling/feature/analyser/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
[email protected]("1.5.0")
[email protected]("1.6.0")
package org.apache.sling.feature.analyser;
