seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix launching commands

6.19.x
Artem Zatsarynnyi 2017-09-19 17:51:01 +03:00
parent c0283c1640
commit c04314da1a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/jsonrpc/WsMasterJsonRpcInitializer.java
View File

@ -17,7 +17,7 @@ import static org.eclipse.che.api.workspace.shared.Constants.INSTALLER_LOG_METHO
import static org.eclipse.che.api.workspace.shared.Constants.LINK_REL_ENVIRONMENT_STATUS_CHANNEL;
import static org.eclipse.che.api.workspace.shared.Constants.MACHINE_LOG_METHOD;
import static org.eclipse.che.api.workspace.shared.Constants.MACHINE_STATUS_CHANGED_METHOD;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_HTTP_REFERENCE;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_STATUS_CHANGED_METHOD;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_TERMINAL_REFERENCE;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_WS_AGENT_HTTP_REFERENCE;
@ -203,7 +203,7 @@ public class WsMasterJsonRpcInitializer {
eventBus.fireEvent(new WsAgentServerRunningEvent(machine.getName()));
} else if (SERVER_TERMINAL_REFERENCE.equals(server.getName())) {
eventBus.fireEvent(new TerminalAgentServerRunningEvent(machine.getName()));
} else if (SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE.equals(server.getName())) {
} else if (SERVER_EXEC_AGENT_HTTP_REFERENCE.equals(server.getName())) {
eventBus.fireEvent(new ExecAgentServerRunningEvent(machine.getName()));
}
}

6
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/events/ServerStatusEventHandler.java
View File

@ -12,7 +12,7 @@ package org.eclipse.che.ide.workspace.events;
import static org.eclipse.che.api.core.model.workspace.runtime.ServerStatus.RUNNING;
import static org.eclipse.che.api.core.model.workspace.runtime.ServerStatus.STOPPED;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_HTTP_REFERENCE;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_STATUS_CHANGED_METHOD;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_TERMINAL_REFERENCE;
import static org.eclipse.che.api.workspace.shared.Constants.SERVER_WS_AGENT_HTTP_REFERENCE;
@ -87,7 +87,7 @@ class ServerStatusEventHandler {
eventBus.fireEvent(new WsAgentServerRunningEvent(event.getMachineName()));
} else if (SERVER_TERMINAL_REFERENCE.equals(event.getServerName())) {
eventBus.fireEvent(new TerminalAgentServerRunningEvent(event.getMachineName()));
} else if (SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE.equals(event.getServerName())) {
} else if (SERVER_EXEC_AGENT_HTTP_REFERENCE.equals(event.getServerName())) {
eventBus.fireEvent(new ExecAgentServerRunningEvent(event.getMachineName()));
}
} else if (event.getStatus() == STOPPED) {
@ -99,7 +99,7 @@ class ServerStatusEventHandler {
eventBus.fireEvent(new WsAgentServerStoppedEvent(event.getMachineName()));
} else if (SERVER_TERMINAL_REFERENCE.equals(event.getServerName())) {
eventBus.fireEvent(new TerminalAgentServerStoppedEvent(event.getMachineName()));
} else if (SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE.equals(event.getServerName())) {
} else if (SERVER_EXEC_AGENT_HTTP_REFERENCE.equals(event.getServerName())) {
eventBus.fireEvent(new ExecAgentServerStoppedEvent(event.getMachineName()));
}
}

1
wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java
View File

@ -64,6 +64,7 @@ public final class Constants {
public static final String SERVER_WS_AGENT_WEBSOCKET_REFERENCE = "wsagent/ws";
public static final String SERVER_TERMINAL_REFERENCE = "terminal";
public static final String SERVER_SSH_REFERENCE = "ssh";
public static final String SERVER_EXEC_AGENT_HTTP_REFERENCE = "exec-agent/http";
public static final String SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE = "exec-agent/ws";
public static final String WS_AGENT_PORT = "4401/tcp";