You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2022/03/31 12:21:07 UTC
[incubator-streampipes] branch dev updated: [STREAMPIPES-523] remap base url of core if SP_DEBUG=true
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new b6ddff7 [STREAMPIPES-523] remap base url of core if SP_DEBUG=true
b6ddff7 is described below
commit b6ddff71a8a84556b179710aac95bd533c46fdb2
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Mar 31 14:20:54 2022 +0200
[STREAMPIPES-523] remap base url of core if SP_DEBUG=true
---
...StreamPipesClientRuntimeConnectionResolver.java | 23 ++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/streampipes-service-extensions-base/src/main/java/org/apache/streampipes/service/extensions/base/client/StreamPipesClientRuntimeConnectionResolver.java b/streampipes-service-extensions-base/src/main/java/org/apache/streampipes/service/extensions/base/client/StreamPipesClientRuntimeConnectionResolver.java
index 3f3ca01..e9bf03b 100644
--- a/streampipes-service-extensions-base/src/main/java/org/apache/streampipes/service/extensions/base/client/StreamPipesClientRuntimeConnectionResolver.java
+++ b/streampipes-service-extensions-base/src/main/java/org/apache/streampipes/service/extensions/base/client/StreamPipesClientRuntimeConnectionResolver.java
@@ -22,15 +22,21 @@ import org.apache.streampipes.client.credentials.StreamPipesTokenCredentials;
import org.apache.streampipes.client.model.ClientConnectionUrlResolver;
import org.apache.streampipes.commons.constants.Envs;
import org.apache.streampipes.commons.constants.DefaultEnvValues;
+import org.apache.streampipes.commons.networking.Networking;
+import org.apache.streampipes.service.base.BaseNetworkingConfig;
import org.apache.streampipes.svcdiscovery.SpServiceDiscovery;
import org.apache.streampipes.svcdiscovery.api.model.DefaultSpServiceGroups;
import org.apache.streampipes.svcdiscovery.api.model.DefaultSpServiceTags;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.net.UnknownHostException;
import java.util.Collections;
import java.util.List;
public class StreamPipesClientRuntimeConnectionResolver implements ClientConnectionUrlResolver {
+ private static final Logger LOG = LoggerFactory.getLogger(StreamPipesClientRuntimeConnectionResolver.class.getCanonicalName());
+
public StreamPipesClientRuntimeConnectionResolver() {
}
@@ -42,7 +48,20 @@ public class StreamPipesClientRuntimeConnectionResolver implements ClientConnect
@Override
public String getBaseUrl() {
- return findClientServices().size() > 0 ? findClientServices().get(0) : "";
+ List<String> baseUrls = findClientServices();
+ if (baseUrls.size() > 0) {
+ if (Envs.SP_DEBUG.exists()) {
+ try {
+ return "http://" + Networking.getHostname() + ":" + 8030;
+ } catch (UnknownHostException e) {
+ LOG.error("Could not auto-resolve host address - using http://localhost:8030");
+ return "http://localhost:8030";
+ }
+ }
+ return baseUrls.get(0);
+ } else {
+ return "";
+ }
}
private String getClientApiUser() {