Skip to content

Commit

Permalink
don't log an ERROR log for automatically issued ackList
Browse files Browse the repository at this point in the history
* when the original signal did not request any acknowledements
* only log a INFO log instead

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
  • Loading branch information
thjaeckle committed Aug 19, 2022
1 parent 0a0c12b commit 9754996
Showing 1 changed file with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -210,18 +210,25 @@ private void issueAcknowledgements(final OutboundSignal.MultiMapped multiMapped,

final ThreadSafeDittoLoggingAdapter l = logger.withCorrelationId(multiMapped.getSource());
if (!ackList.isEmpty()) {
final DittoHeaders sourceSignalHeaders = multiMapped.getSource().getDittoHeaders();
final Acknowledgements aggregatedAcks = appendConnectionId(
Acknowledgements.of(ackList, multiMapped.getSource().getDittoHeaders()));
Acknowledgements.of(ackList, sourceSignalHeaders));

final String ackregatorAddress = aggregatedAcks.getDittoHeaders()
.get(DittoHeaderDefinition.DITTO_ACKREGATOR_ADDRESS.getKey());
if (null != ackregatorAddress) {
final ActorSelection acknowledgementRequester = getContext().actorSelection(ackregatorAddress);
l.debug("Message sent. Replying to <{}>: <{}>", acknowledgementRequester, aggregatedAcks);
acknowledgementRequester.tell(aggregatedAcks, ActorRef.noSender());
} else if (sourceSignalHeaders.getAcknowledgementRequests().isEmpty()) {
l.info("Aggregated Acknowledgements did not contain header of acknowledgement aggregator, but " +
"ignoring ackList to issue as the source signal did not request any ACKs in its " +
"headers: <{}> - source signal headers: <{}>", aggregatedAcks, sourceSignalHeaders);
} else {
// only log the error if the originating signal even did request acks in the first place
// the ackList could be a result of an error automatically converted to a negative ACK
l.error("Aggregated Acknowledgements did not contain header of acknowledgement aggregator " +
"address: {}", aggregatedAcks.getDittoHeaders());
"address: <{}> - source signal headers: {}", aggregatedAcks, sourceSignalHeaders);
}
} else {
l.debug("Message sent: No acks requested.");
Expand Down

0 comments on commit 9754996

Please sign in to comment.