[sling-org-apache-sling-distribution-journal] branch master updated: SLING-9628 - Add pubAgentName to LogMessage

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git


The following commit(s) were added to refs/heads/master by this push:
     new 10d4b4f  SLING-9628 - Add pubAgentName to LogMessage
10d4b4f is described below

commit 10d4b4fa70edc5d79e09a7a7c7f5e87089485708
Author: Christian Schneider <cschn...@adobe.com>
AuthorDate: Mon Aug 10 16:31:00 2020 +0200

    SLING-9628 - Add pubAgentName to LogMessage
---
 .../org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
 
b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
index 01cc6a0..a593365 100644
--- 
a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
+++ 
b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
@@ -201,17 +201,18 @@ public class BookKeeper implements Closeable {
             packageRetries.increase(pubAgentName);
             String retriesSt = errorQueueEnabled ? 
Integer.toString(config.getMaxRetries()) : "infinite";
             String msg = format("Error processing distribution package %s. 
Retry attempts %s/%s. Message: %s", pkgMsg.getPkgId(), retries, retriesSt, 
e.getMessage());
-            LogMessage logMessage = getLogMessage(msg, e);
+            LogMessage logMessage = getLogMessage(pubAgentName, msg, e);
             logSender.accept(logMessage);
             throw new DistributionException(msg, e);
         }
     }
 
-    private LogMessage getLogMessage(String msg, Exception e) {
+    private LogMessage getLogMessage(String pubAgentName, String msg, 
Exception e) {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         e.printStackTrace(pw);
         return LogMessage.builder()
+                .pubAgentName(pubAgentName)
                 .subSlingId(config.getSubSlingId())
                 .subAgentName(config.getSubAgentName())
                 .message(msg)