You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/11/24 08:46:05 UTC

[incubator-streampipes-extensions] branch dev updated: Set new backend URL for connect adapers

This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git


The following commit(s) were added to refs/heads/dev by this push:
     new 7795050  Set new backend URL for connect adapers
7795050 is described below

commit 7795050abb92107326762681fcdeb18b40e25fad
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Nov 24 09:45:30 2020 +0100

    Set new backend URL for connect adapers
---
 .idea/runConfigurations/connect_adapters.xml                   |  2 +-
 .../org/apache/streampipes/connect/ConnectAdapterInit.java     |  6 ++----
 .../apache/streampipes/connect/config/ConnectWorkerConfig.java | 10 +++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.idea/runConfigurations/connect_adapters.xml b/.idea/runConfigurations/connect_adapters.xml
index f59895f..d3c6f97 100644
--- a/.idea/runConfigurations/connect_adapters.xml
+++ b/.idea/runConfigurations/connect_adapters.xml
@@ -3,7 +3,7 @@
     <envs>
       <env name="SP_CONNECT_CONTAINER_WORKER_HOST" value="host.docker.internal" />
       <env name="SP_CONNECT_CONTAINER_HOST" value="host.docker.internal" />
-      <env name="SP_CONNECT_CONTAINER_MASTER_HOST" value="localhost" />
+      <env name="SP_BACKEND_HOST" value="localhost" />
       <env name="SP_DATA_LOCATION" value="./test_data/" />
       <env name="SP_DEBUG" value="true" />
       <env name="SP_DEBUG_CONNECT" value="false" />
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
index 1e49c67..53784f8 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
@@ -99,12 +99,10 @@ public class ConnectAdapterInit extends AdapterWorkerContainer {
             .add(new FlicMQTTAdapter());
 
     String workerUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerUrl();
-//    String masterUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerMasterUrl();
+    String backendUrl = ConnectWorkerConfig.INSTANCE.getBackendUrl();
     Integer workerPort = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerPort();
 
-    // TODO
-    new ConnectAdapterInit().init(workerUrl, "http://localhost:8030/streampipes-backend/api/v2/connect", workerPort);
-
+    new ConnectAdapterInit().init(workerUrl, backendUrl, workerPort);
 
   }
 }
diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
index 1bd5f97..431e6f7 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java
@@ -37,8 +37,8 @@ public enum ConnectWorkerConfig {
     config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, 8098, "The port of the connect container");
     config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, name, "The hostname of the connect container");
 
-//    config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT, Config.MASTER_PORT, "The port of the connect container");
-//    config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST, Config.MASTER_HOST, "The hostname of the connect container");
+    config.register(ConfigKeys.BACKEND_HOST, "backend", "The host of the backend to register the worker");
+    config.register(ConfigKeys.BACKEND_PORT, 8030, "The port of the backend to register the worker");
 
   }
 
@@ -46,9 +46,9 @@ public enum ConnectWorkerConfig {
     return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT) + "/";
   }
 
-//  public String getConnectContainerMasterUrl() {
-//    return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT) + "/";
-//  }
+  public String getBackendUrl() {
+    return "http://" + config.getString(ConfigKeys.BACKEND_HOST) + ":" + config.getInteger(ConfigKeys.BACKEND_PORT) + "/";
+  }
 
   public String getKafkaHost() {
     return config.getString(ConfigKeys.KAFKA_HOST);