Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Small logging changes

This commit is contained in:
Robert von Burg 2017-04-06 08:42:05 +02:00
parent 2a3ee2bcf0
commit fbb2bc85db
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java
View File

@ -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);
}
}
}

2
li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java
View File

@ -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()) {