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

Switch from PID to VM descriptor

Browse Source
This commit is contained in:
BoykoAlex
2017-11-02 12:07:58 -04:00
parent 4c89152848
commit 0e2c0f15ea
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
@@ -61,7 +62,7 @@ public class SpringBootApp {
private VirtualMachineDescriptor vmd;
private Supplier<String> jmxConnect;
private static final Cache<String, String> pidToJmxConnectUrl = CacheBuilder.newBuilder().build();
private static final Cache<VirtualMachineDescriptor, String> pidToJmxConnectUrl = CacheBuilder.newBuilder().build();
private static Callable<Collection<SpringBootApp>> cached(Callable<Collection<SpringBootApp>> provider) {
LoadingCache<Object, CompletableFuture<Collection<SpringBootApp>>> cache = CacheBuilder.newBuilder()
@@ -102,6 +103,12 @@ public class SpringBootApp {
for (VirtualMachineDescriptor vmd : list) {
apps.add(new SpringBootApp(vmd));
}
// Invalidate part of pidToJmxConnectUrl cache to remove old processes
Set<VirtualMachineDescriptor> oldProcesses = new HashSet<>(pidToJmxConnectUrl.asMap().keySet());
oldProcesses.removeAll(list);
pidToJmxConnectUrl.invalidateAll(oldProcesses);
return apps.build();
}
@@ -134,9 +141,10 @@ public class SpringBootApp {
}
private String getJmxConnectUrl() {
String pid = getProcessID();
try {
return pidToJmxConnectUrl.get(pid, () -> vm.startLocalManagementAgent());
return pidToJmxConnectUrl.get(vmd, () -> {
return vm.startLocalManagementAgent();
});
} catch (ExecutionException e) {
Log.log(e);
return null;