From d62df31df10f9af3d0a05ca187a16997ad32fa77 Mon Sep 17 00:00:00 2001 From: lucio Date: Wed, 22 Jun 2022 18:52:11 +0200 Subject: [PATCH] added proxy --- .../core/publisher/is/legacy/LegacyISPublisher.java | 6 ++++++ .../is/legacy/application/ApplicationProfileBuilder.java | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java b/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java index 98593b5..ad74456 100644 --- a/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java +++ b/src/main/java/org/gcube/common/core/publisher/is/legacy/LegacyISPublisher.java @@ -40,13 +40,16 @@ public class LegacyISPublisher implements Publisher{ AuthorizationProvider provider = container.configuration().authorizationProvider(); for (String context : provider.getContexts()) try { + logger.info("publishing container in context {}", context); AuthorizedTasks.executeSafely(new Runnable() { @Override public void run() { try { + logger.info("(inside task)publishing container in context {}", context); registry.getStubs().create(toXml(hostingNode), hostingNode.type().toString()); }catch (Exception e) { + logger.error("error publishing container", e); throw new RuntimeException(e); } @@ -69,13 +72,16 @@ public class LegacyISPublisher implements Publisher{ AuthorizationProvider provider = application.container().configuration().authorizationProvider(); for (String context : provider.getContexts()) try { + logger.info("publishing application in context {}", context); AuthorizedTasks.executeSafely(new Runnable() { @Override public void run() { try { + logger.info("(inside task)publishing application in context {}", context); registry.getStubs().create(toXml(enpoint), enpoint.type().toString()); }catch (Exception e) { + logger.error("erro publishing application", e); throw new RuntimeException(e); } diff --git a/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java b/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java index 36936ef..b2d6ac6 100644 --- a/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java +++ b/src/main/java/org/gcube/common/core/publisher/is/legacy/application/ApplicationProfileBuilder.java @@ -48,11 +48,11 @@ public class ApplicationProfileBuilder { endpoint.profile().endpoints().clear(); String baseAddress; - if (configuration.proxied()){ - String protocol = configuration.proxyAddress().getProtocol(); - String port = configuration.proxyAddress().getPort()!=null?":"+configuration.proxyAddress().getPort():""; + if (configuration.proxied() && container.proxy()!=null){ + String protocol = container.proxy().getProtocol(); + String port = container.proxy().getPort()!=null?":"+container.proxy().getPort():""; - baseAddress=String.format("%s://%s%s%s", protocol , configuration.proxyAddress().getHostname(), port,context.application().getContextPath()); + baseAddress=String.format("%s://%s%s%s", protocol , container.proxy().getHostname(), port,context.application().getContextPath()); } else { String protocol = container.protocol(); int port = container.port();