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 2020/12/04 10:09:08 UTC
[incubator-streampipes] branch edge-extensions updated: [hotfix]
move node janitor out of dev setup and some minors
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/edge-extensions by this push:
new 0e7883c [hotfix] move node janitor out of dev setup and some minors
0e7883c is described below
commit 0e7883caa32adf5463f47fa11cf453d2052e5341
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Fri Dec 4 11:08:52 2020 +0100
[hotfix] move node janitor out of dev setup and some minors
---
.../node/controller/container/NodeControllerContainerInit.java | 6 +++---
.../node/controller/container/rest/InvocableEntityResource.java | 5 +++++
ui/webpack.partial.dev.js | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/NodeControllerContainerInit.java b/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/NodeControllerContainerInit.java
index 4ff12ac..0501dfe 100644
--- a/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/NodeControllerContainerInit.java
+++ b/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/NodeControllerContainerInit.java
@@ -53,15 +53,15 @@ public class NodeControllerContainerInit {
LOG.info("Load static node metadata");
NodeInfoStorage.init();
- LOG.info("Start Node Janitor manager");
- NodeJanitorManager.getInstance().run();
-
LOG.info("Start Node Resource manager");
ResourceManager.getInstance().run();
if (!"true".equals(System.getenv("SP_DEBUG"))) {
LOG.info("Auto-deploy StreamPipes node container");
DockerContainerOrchestrator.getInstance().init();
+
+ LOG.info("Start Node Janitor manager");
+ NodeJanitorManager.getInstance().run();
}
// registration with consul here
diff --git a/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/rest/InvocableEntityResource.java b/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/rest/InvocableEntityResource.java
index f1823fd..11a51b0 100644
--- a/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/rest/InvocableEntityResource.java
+++ b/streampipes-node-controller-container/src/main/java/org/apache/streampipes/node/controller/container/rest/InvocableEntityResource.java
@@ -22,6 +22,7 @@ import org.apache.streampipes.container.transform.Transformer;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.graph.DataProcessorInvocation;
import org.apache.streampipes.model.graph.DataSinkInvocation;
+import org.apache.streampipes.model.grounding.EventGrounding;
import org.apache.streampipes.model.node.PipelineElementDockerContainer;
import org.apache.streampipes.node.controller.container.management.orchestrator.docker.DockerContainerOrchestrator;
import org.apache.streampipes.node.controller.container.management.pe.InvocableElementManager;
@@ -84,6 +85,10 @@ public class InvocableEntityResource<I extends InvocableStreamPipesEntity> exten
try {
if (identifier.equals("sepa")) {
graph = Transformer.fromJsonLd(DataProcessorInvocation.class, payload);
+
+ //((DataProcessorInvocation) graph).getOutputStreamRelays();
+ //EventGrounding source = ((DataProcessorInvocation) graph).getOutputStream().getEventGrounding();
+
endpoint = graph.getBelongsTo();
// TODO: start event relay to remote broker
diff --git a/ui/webpack.partial.dev.js b/ui/webpack.partial.dev.js
index d917ad8..9889b6b 100644
--- a/ui/webpack.partial.dev.js
+++ b/ui/webpack.partial.dev.js
@@ -49,7 +49,7 @@ module.exports = merge(baseConfig, {
secure: false,
},
'/streampipes/ws': {
- target: 'ws://localhost:61614',
+ target: 'ws://[::1]:61614',
ws: true,
secure: false,
},