diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/core/engine/Engine.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/core/engine/Engine.java index 27996b03..d5315ff0 100644 --- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/core/engine/Engine.java +++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/core/engine/Engine.java @@ -15,10 +15,9 @@ public Engine() { // source: source of the local stream to initialize public Response processSTRT(Packet packet) { // start output processes: - //TODO: RE-ENABLE -// Response out_response = send("OUT", "STRT"); -// if(out_response.code() != 200) -// return out_response; + Response out_response = send("OUT", "STRT"); + if(out_response.code() != 200) + return out_response; // start local stream handler processes: String lsh_type = Config.getProperty("stream", "local.stream.type"); diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/producers/SocketProducer.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/producers/SocketProducer.java index e29be73a..0d8c1102 100644 --- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/producers/SocketProducer.java +++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/producers/SocketProducer.java @@ -26,12 +26,13 @@ protected boolean init() { listener = new Thread() { public void run() { while(true) { + System.out.println("accepting..."); String key = SocketManager.accept(Integer.parseInt(Config.getProperty("stream", "output.socket.port")), producer); if(key == null) { System.err.println("SocketProducer: Could not create connection to socket port."); System.exit(1); } - + System.out.println("accepted!"); manager.add(new SocketDestination(key, SocketManager.write(key))); } } diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java index b64cd4a8..2c273ca8 100644 --- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java +++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java @@ -32,8 +32,8 @@ public class Config { stream_properties.put("output.socket.port", "61200"); stream_properties.put("local.stream.type", "mongo_db"); //stream_properties.put("local.stream.type", "null"); - //stream_properties.put("mongodb.properties.uri", "mongodb://MONGO:27017"); - stream_properties.put("mongodb.properties.uri", "mongodb://localhost:27017"); + stream_properties.put("mongodb.properties.uri", "mongodb://MONGO:27017"); + //stream_properties.put("mongodb.properties.uri", "mongodb://localhost:27017"); stream_properties.put("mongodb.database.state", "main-state-db"); stream_properties.put("mongodb.database.main", "main-db"); stream_properties.put("mongodb.auth.collection", "auth-collection"); diff --git a/DeFi-Data-Engine/docker-compose.yml b/DeFi-Data-Engine/docker-compose.yml index 8f24ad09..6b5a47b7 100644 --- a/DeFi-Data-Engine/docker-compose.yml +++ b/DeFi-Data-Engine/docker-compose.yml @@ -17,15 +17,15 @@ services: - 61100:61100 - 61200:61200 hostname: DataEngine - restapp: - build: - context: "Rest Application" - image: dataincite/data-engine-rest-app:latest - depends_on: - - dataengine - ports: - - 8080:8080 - hostname: RestApp + # restapp: + # build: + # context: "Rest Application" + # image: dataincite/data-engine-rest-app:latest + # depends_on: + # - dataengine + # ports: + # - 8080:8080 + # hostname: RestApp