From fbb2bc85db1edf797f28fbade7c61f567bea4c14 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 6 Apr 2017 08:42:05 +0200 Subject: [PATCH] [Minor] Small logging changes --- .../service/api/DefaultServiceHandler.java | 15 ++++++++------- .../strolch/model/json/FromFlatJsonVisitor.java | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java b/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java index 46bc89416..ca9e5a451 100644 --- a/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java +++ b/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java @@ -141,7 +141,7 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa logger.info(msg); } else if (serviceResult.getState() == ServiceResultState.WARNING) { - msg = ServiceResultState.WARNING + " " + msg; + msg = ServiceResultState.WARNING + ": " + msg; logger.warn(msg); if (StringHelper.isNotEmpty(serviceResult.getMessage()) && serviceResult.getThrowable() != null) { @@ -152,9 +152,10 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa logger.warn("Reason: " + serviceResult.getThrowable().getMessage(), serviceResult.getThrowable()); } - } else if (serviceResult.getState() == ServiceResultState.FAILED) { + } else if (serviceResult.getState() == ServiceResultState.FAILED + || serviceResult.getState() == ServiceResultState.ACCESS_DENIED) { - msg = ServiceResultState.FAILED + " " + msg; + msg = serviceResult.getState() + ": " + msg; logger.error(msg); if (StringHelper.isNotEmpty(serviceResult.getMessage()) && serviceResult.getThrowable() != null) { @@ -165,11 +166,11 @@ public class DefaultServiceHandler extends StrolchComponent implements ServiceHa logger.error("Reason: " + serviceResult.getThrowable().getMessage(), serviceResult.getThrowable()); } } else if (serviceResult.getState() == null) { - logger.warn("Service " + service.getClass().getName() + " returned a null ServiceResultState!"); - logger.warn(msg); + logger.error("Service " + service.getClass().getName() + " returned a null ServiceResultState!"); + logger.error(msg); } else { - logger.warn("UNHANDLED SERVICE RESULT STATE: " + serviceResult.getState()); - logger.warn(msg); + logger.error("UNHANDLED SERVICE RESULT STATE: " + serviceResult.getState()); + logger.error(msg); } } } diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java index 8569f0625..17e5d3e2c 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java +++ b/li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java @@ -84,7 +84,7 @@ public class FromFlatJsonVisitor { if (jsonElement == null) { if (this.optionalKeys.containsElement(bagId, paramId)) continue; - throw new StrolchModelException("JsonObject is missing member with ID " + paramId); + throw new StrolchModelException("JsonObject is missing member " + paramId); } if (!jsonElement.isJsonPrimitive()) {