You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/06/17 18:03:19 UTC
[incubator-streampipes] branch STREAMPIPES-319 updated:
[STREAMPIPES-319] Add merge feature to ServiceDefinitionBuilder
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-319 by this push:
new 3eb1933 [STREAMPIPES-319] Add merge feature to ServiceDefinitionBuilder
3eb1933 is described below
commit 3eb1933c49880ca14865550d6e45485d1dc632fe
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Thu Jun 17 20:02:56 2021 +0200
[STREAMPIPES-319] Add merge feature to ServiceDefinitionBuilder
---
.../container/standalone/init/StandaloneModelSubmitter.java | 9 +++++++++
.../streampipes/container/model/SpServiceDefinitionBuilder.java | 5 +++++
.../svcdiscovery/consul/SpConsulServiceDiscovery.java | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
index a6e863b..16a869a 100644
--- a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
+++ b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
@@ -48,6 +48,11 @@ public abstract class StandaloneModelSubmitter extends ModelSubmitter<PeConfig>
private static final Logger LOG =
LoggerFactory.getLogger(StandaloneModelSubmitter.class.getCanonicalName());
+ public void init() {
+ SpServiceDefinition serviceDef = provideServiceDefinition();
+ init(serviceDef);
+ }
+
public void init(SpServiceDefinition serviceDef) {
try {
String host = Networking.getHostname();
@@ -90,6 +95,10 @@ public abstract class StandaloneModelSubmitter extends ModelSubmitter<PeConfig>
app.run();
}
+ public SpServiceDefinition provideServiceDefinition() {
+ return null;
+ }
+
@PreDestroy
public void onExit() {
LOG.info("Shutting down StreamPipes pipeline element container...");
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java b/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java
index 7912c5e..de8eb90 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/model/SpServiceDefinitionBuilder.java
@@ -109,6 +109,11 @@ public class SpServiceDefinitionBuilder {
return this;
}
+ public SpServiceDefinitionBuilder merge(SpServiceDefinition other) {
+ this.serviceDefinition.addDeclarers(other.getDeclarers());
+ return this;
+ }
+
public SpServiceDefinition build() {
return this.serviceDefinition;
}
diff --git a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/SpConsulServiceDiscovery.java b/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/SpConsulServiceDiscovery.java
index d07638b..d595bb3 100644
--- a/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/SpConsulServiceDiscovery.java
+++ b/streampipes-service-discovery-consul/src/main/java/org/apache/streampipes/svcdiscovery/consul/SpConsulServiceDiscovery.java
@@ -50,7 +50,7 @@ public class SpConsulServiceDiscovery extends AbstractConsulService implements I
boolean connected = false;
while (!connected) {
- LOG.info("Trying to register service at Consul: " + svcId);
+ LOG.info("Trying to register service at Consul with svcGroup={}, svcId={} host={}, port={}. ", svcGroup, svcId, host, port);
ConsulServiceRegistrationBody svcRegistration = createRegistrationBody(svcGroup, svcId, host, port, tags);
connected = registerServiceHttpClient(svcRegistration);