You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/10/02 14:13:58 UTC
[incubator-dlab] branch develop updated (3b711e0 -> 9b5d188)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 3b711e0 Merge pull request #332 from apache/DLAB-1150
new b441385 DLAB-000 fixed bug connected with web terminal
new 9b5d188 DLAB-000 fixed bug connected with web terminal
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: DLAB-000 fixed bug connected with web
terminal
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9b5d188a1b837d8a596d7ae9f11507981b289c62
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Oct 2 17:13:38 2019 +0300
DLAB-000 fixed bug connected with web terminal
---
.../com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
index 30f9f82..2394595 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
@@ -28,6 +28,7 @@ public class GuacamoleServiceImpl implements GuacamoleService {
private static final String PRIVATE_KEY_PARAM_NAME = "private-key";
private static final String HOSTNAME_PARAM = "hostname";
private static final String CONNECTION_PROTOCOL_PARAM = "connectionProtocol";
+ private static final String SERVER_HOST_PARAM = "serverHost";
private final SelfServiceApplicationConfiguration conf;
private final RESTService provisioningService;
private final EndpointService endpointService;
@@ -50,7 +51,7 @@ public class GuacamoleServiceImpl implements GuacamoleService {
final String guacamoleServerHost = new URI(url).getHost();
InetGuacamoleSocket socket = new InetGuacamoleSocket(guacamoleServerHost, conf.getGuacamolePort());
final Map<String, String> guacamoleConf = conf.getGuacamole();
- guacamoleConf.put("serverHost", guacamoleServerHost);
+ guacamoleConf.put(SERVER_HOST_PARAM, guacamoleServerHost);
GuacamoleConfiguration guacamoleConfig = getGuacamoleConfig(key, guacamoleConf, host);
return new SimpleGuacamoleTunnel(new ConfiguredGuacamoleSocket(socket, guacamoleConfig));
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: DLAB-000 fixed bug connected with web
terminal
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b441385a150cb3cd7ab66ab3bd3e9122b467cba9
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Oct 2 17:13:13 2019 +0300
DLAB-000 fixed bug connected with web terminal
---
.../epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
index e64ce09..30f9f82 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
@@ -47,8 +47,11 @@ public class GuacamoleServiceImpl implements GuacamoleService {
final String url = endpointService.get(endpoint).getUrl();
String key = provisioningService.get(url + KeyAPI.GET_ADMIN_KEY,
userInfo.getAccessToken(), String.class);
- InetGuacamoleSocket socket = new InetGuacamoleSocket(new URI(url).getHost(), conf.getGuacamolePort());
- GuacamoleConfiguration guacamoleConfig = getGuacamoleConfig(key, conf.getGuacamole(), host);
+ final String guacamoleServerHost = new URI(url).getHost();
+ InetGuacamoleSocket socket = new InetGuacamoleSocket(guacamoleServerHost, conf.getGuacamolePort());
+ final Map<String, String> guacamoleConf = conf.getGuacamole();
+ guacamoleConf.put("serverHost", guacamoleServerHost);
+ GuacamoleConfiguration guacamoleConfig = getGuacamoleConfig(key, guacamoleConf, host);
return new SimpleGuacamoleTunnel(new ConfiguredGuacamoleSocket(socket, guacamoleConfig));
} catch (Exception e) {
log.error("Can not create guacamole tunnel due to: " + e.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org