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

PT 169821438 - Show error on maximum retries for live hovers v2

Browse Source 
When maximum retries for connect, disconnect, and refresh live data is
reached, show an error in the client.
This commit is contained in:
nsingh@pivotal.io
2020-01-06 15:47:20 -08:00
parent 8f7dbda757
commit 2de688f037
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016, 2019 Pivotal, Inc.
* Copyright (c) 2016, 2020 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -152,7 +152,7 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent
//
// central live data components (to coordinate live data flow)
liveDataService = new SpringProcessConnectorService(server.getProgressService(), liveDataProvider);
liveDataService = new SpringProcessConnectorService(server, liveDataProvider);
// connect the live data provider with the hovers (for data extraction and live updates)
hoverProvider = createHoverHandler(projectFinder, sourceLinks, liveDataProvider);

32
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorService.java
View File

@@ -17,9 +17,12 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.commons.languageserver.ProgressTask;
import org.springframework.ide.vscode.boot.app.BootJavaConfig;
import org.springframework.ide.vscode.commons.languageserver.DiagnosticService;
import org.springframework.ide.vscode.commons.languageserver.ProgressService;
import org.springframework.ide.vscode.commons.languageserver.ProgressTask;
import org.springframework.ide.vscode.commons.languageserver.util.ShowMessageException;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
/**
* @author Martin Lippert
@@ -36,18 +39,26 @@ public class SpringProcessConnectorService {
private final SpringProcessConnectionChangeListener connectorListener;
private final ProgressService progressService;
private ProgressService progressService;
private DiagnosticService diagnosticService;
private int progressIdKey = 0;
private int maxRetryCount;
private int retryDelayInSeconds;
public SpringProcessConnectorService(ProgressService progressService, SpringProcessLiveDataProvider liveDataProvider) {
public SpringProcessConnectorService(SimpleLanguageServer server, SpringProcessLiveDataProvider liveDataProvider) {
this.liveDataProvider = liveDataProvider;
this.scheduler = new ScheduledThreadPoolExecutor(10);
this.connectors = new ConcurrentHashMap<>();
this.connectedSuccess = new ConcurrentHashMap<>();
this.progressService = progressService == null ? ProgressService.NO_PROGRESS : progressService;
this.progressService = server.getProgressService();
if (this.progressService == null) {
this.progressService = ProgressService.NO_PROGRESS;
}
this.diagnosticService = server.getDiagnosticService();
this.maxRetryCount = BootJavaConfig.LIVE_INFORMATION_FETCH_DATA_RETRY_MAX_NO_DEFAULT;
this.retryDelayInSeconds = BootJavaConfig.LIVE_INFORMATION_FETCH_DATA_RETRY_DELAY_IN_SECONDS_DEFAULT;
@@ -151,6 +162,10 @@ public class SpringProcessConnectorService {
scheduleConnect(progressTask, processKey, connector, retryDelayInSeconds, TimeUnit.SECONDS, retryNo + 1);
} else {
progressTask.progressDone();
// Send message to client if maximum retries reached on error
diagnosticService.diagnosticEvent(ShowMessageException
.error("Failed to connect to process " + processKey + " after retries: " + retryNo, e));
}
}
}, delay, unit);
@@ -174,6 +189,11 @@ public class SpringProcessConnectorService {
scheduleDisconnect(progressTask, processKey, connector, retryDelayInSeconds, TimeUnit.SECONDS, retryNo + 1);
} else {
progressTask.progressDone();
// Send message to client if maximum retries reached on error
diagnosticService.diagnosticEvent(ShowMessageException
.error("Failed to disconnect from process " + processKey + " after retries: " + retryNo, e));
}
}
}, delay, unit);
@@ -209,6 +229,10 @@ public class SpringProcessConnectorService {
}
else {
progressTask.progressDone();
// Send message to client if maximum retries reached on error
diagnosticService.diagnosticEvent(ShowMessageException
.error("Failed to refresh live data from process " + processKey + " after retries: " + retryNo, e));
disconnectProcess(processKey);
}