Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PT 160096886 - Don't throw exception when actuator not available

Browse Source 
For example, when application is stopping.
This commit is contained in:
nsingh
2018-08-30 12:26:18 +02:00
parent 51d1cf96cd
commit a682269162
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java
View File

@@ -211,11 +211,14 @@ public abstract class AbstractSpringBootApp implements SpringBootApp {
@Override
public LiveBeansModel getBeans() {
try {
return beansModelCache.get("liveBeans", () -> {
String domain = getDomainForActuator();
Object json = getBeansFromActuator(domain);
// PT 160096886 - Moved actuator-based operations out of the cache because
// previous implementation was throwing exception inside the cache loader if actuator JSON was not available.
// This resulted in errors when stopping applications (i.e. when actuator was not available anymore)
if (json != null) {
String domain = getDomainForActuator();
Object json = getBeansFromActuator(domain);
if (json != null) {
return beansModelCache.get("liveBeans", () -> {
String md5 = DigestUtils.md5Hex(json.toString());
synchronized(AbstractSpringBootApp.this) {
@@ -229,11 +232,11 @@ public abstract class AbstractSpringBootApp implements SpringBootApp {
}
return cachedBeansModel;
}
else {
throw new Exception("not getting any beans from app");
}
});
});
} else {
// Actuator info not available (e.g. application stopped), return empty model. Don't return null. Causes Issues
return LiveBeansModel.builder().build();
}
} catch (Exception e) {
logger.error("Error parsing beans", e);
return LiveBeansModel.builder().build();