This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 8cd62f9b5921d830b5e8073f97605866e836a403 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 12:01:51 2016 +0200 Amélioration des logs sur le cache --- .../service/sampling/CruiseSamplingCache.java | 57 ++++++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java index 7d8bed0..fcc89e3 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java @@ -50,6 +50,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.stream.IntStream; /** * @author Kevin Morin (Code Lutin) @@ -734,7 +735,13 @@ public class CruiseSamplingCache implements CruiseCacheAble { CruiseSamplingInternalCache.SamplingData fishingOperationSamplingData = fishingOperationCache.addOneIndividualObservation(fishingOperationSamplingKey); if (log.isInfoEnabled()) { - log.info("add individual observation " + cruiseSamplingKey + " ⇒ op " + fishingOperationSamplingData + " / zone " + zoneSamplingData + " / cruise " + cruiseSamplingData); + log.info(getLogMessage("add individual observation ", + cruiseSamplingKey, + zoneSamplingKey, + fishingOperationSamplingKey, + cruiseSamplingData, + zoneSamplingData, + fishingOperationSamplingData)); } } @@ -753,7 +760,13 @@ public class CruiseSamplingCache implements CruiseCacheAble { CruiseSamplingInternalCache.SamplingData fishingOperationSamplingData = fishingOperationCache.removeOneIndividualObservation(fishingOperationSamplingKey); if (log.isInfoEnabled()) { - log.info("remove individual observation " + cruiseSamplingKey + " ⇒ op " + fishingOperationSamplingData + " / zone " + zoneSamplingData + " / cruise " + cruiseSamplingData); + log.info(getLogMessage("remove individual observation ", + cruiseSamplingKey, + zoneSamplingKey, + fishingOperationSamplingKey, + cruiseSamplingData, + zoneSamplingData, + fishingOperationSamplingData)); } } @@ -772,7 +785,13 @@ public class CruiseSamplingCache implements CruiseCacheAble { CruiseSamplingInternalCache.SamplingData fishingOperationSamplingData = fishingOperationCache.addOneSampling(fishingOperationSamplingKey); if (log.isInfoEnabled()) { - log.info("add sampling " + cruiseSamplingKey + " ⇒ op " + fishingOperationSamplingData + " / zone " + zoneSamplingData + " / cruise " + cruiseSamplingData); + log.info(getLogMessage("add sampling ", + cruiseSamplingKey, + zoneSamplingKey, + fishingOperationSamplingKey, + cruiseSamplingData, + zoneSamplingData, + fishingOperationSamplingData)); } } @@ -791,7 +810,13 @@ public class CruiseSamplingCache implements CruiseCacheAble { CruiseSamplingInternalCache.SamplingData fishingOperationSamplingData = fishingOperationCache.removeOneSampling(fishingOperationSamplingKey); if (log.isInfoEnabled()) { - log.info("remove sampling " + cruiseSamplingKey + " ⇒ op " + fishingOperationSamplingData + " / zone " + zoneSamplingData + " / cruise " + cruiseSamplingData); + log.info(getLogMessage("remove sampling ", + cruiseSamplingKey, + zoneSamplingKey, + fishingOperationSamplingKey, + cruiseSamplingData, + zoneSamplingData, + fishingOperationSamplingData)); } } @@ -909,4 +934,28 @@ public class CruiseSamplingCache implements CruiseCacheAble { return Optional.ofNullable(result); } + + private String getLogMessage(String prefix, + String cruiseSamplingKey, + String zoneSamplingKey, + String fishingOperationSamplingKey, + CruiseSamplingInternalCache.SamplingData cruiseSamplingData, + CruiseSamplingInternalCache.SamplingData zoneSamplingData, + CruiseSamplingInternalCache.SamplingData fishingOperationSamplingData) { + + int maxSize = IntStream + .builder() + .add(cruiseSamplingKey.length()) + .add(zoneSamplingKey.length()) + .add(fishingOperationSamplingKey.length()) + .build() + .max() + .getAsInt(); + return prefix + + "\n[cruise " + (String.format("%1$" + maxSize + "s", cruiseSamplingKey).replaceAll(" ", ".")) + "] → " + cruiseSamplingData + + "\n[zone " + (String.format("%1$" + maxSize + "s", zoneSamplingKey).replaceAll(" ", ".")) + "] → " + zoneSamplingData + + "\n[fishing operation " + (String.format("%1$" + maxSize + "s", fishingOperationSamplingKey).replaceAll(" ", ".")) + "] → " + fishingOperationSamplingData; + + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.