Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Remove usage of MachineExtensionProxyServlet #1052

Merged
merged 1 commit into from
Apr 18, 2016
Merged

Conversation

vparfonov
Copy link
Contributor

@vparfonov vparfonov commented Apr 15, 2016

Add path to wsagent into wsagent server url to avoid doing that on clients.
Add class DevMachine on client-side what contain all needed information for communicate with wsagent and terminal

@skabashnyuk @sleshchenko @garagatyi

@@ -105,13 +105,20 @@ public void startWsAgent(String workspaceId) throws NotFoundException, MachineEx
} catch (BadRequestException wsAgentLaunchingExc) {
throw new MachineException(wsAgentLaunchingExc.getLocalizedMessage(), wsAgentLaunchingExc);
}
LOG.error(String.format("Fail pinging ws agent. Workspace ID:%s. Url:%s. Timestamp:{}",workspaceId,UriBuilder.fromUri(devMachine.getRuntime()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not use String.format here. LOG.error has its own API to submit parameters - "{}"

@garagatyi garagatyi changed the title Remove usage of MachineExtensionProxyServlet [WIP] Remove usage of MachineExtensionProxyServlet Apr 15, 2016
@@ -126,8 +128,8 @@ public void makeCall(AsyncCallback<CompilationUnit> callback) {

@Override
public Promise<ImplementationsDescriptorDTO> getImplementations(String projectPath, String fqn, int offset) {
final String url = restContext + "/jdt/" + workspaceId + "/navigation/implementations?projectpath=" + projectPath + "&fqn=" + fqn +
"&offset=" + offset;
final String url =appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/" + workspaceId + "/navigation/implementations" +

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add space after assignment operator

@sleshchenko
Copy link
Member

other OK for me

-->
<Context allowCasualMultipartParsing="true">
<Valve className="org.apache.catalina.valves.rewrite.RewriteValve"/>
</Context>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add new line at the end of file

@garagatyi
Copy link

Except those lines that I commented everything is OK. Great job!

@vparfonov
Copy link
Contributor Author

all comments are fixed

@garagatyi
Copy link

LGTM

Add path to wsagent into wsagent server url to avoid doing that on client-side
Add class DevMachine on client-side what contain all needed information for communicate with wsagent and terminal
Remove @nAmed(cheExtensionPath)

Signed-off-by: Vitaly Parfonov <vparfonov@codenvy.com>
@vparfonov vparfonov merged commit 5fdd423 into master Apr 18, 2016
@vparfonov vparfonov deleted the CHE-708_CHE-869 branch April 18, 2016 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants