From 61f6b2e04172ed17b6ec3e331d132e5304aeb38a Mon Sep 17 00:00:00 2001 From: Conor Flynn Date: Tue, 21 Mar 2023 13:47:38 -0400 Subject: [PATCH 1/3] socket manager minor fix --- .../java/org/out/socket/SocketManager.java | 18 +++++++++--------- .../src/main/java/org/properties/Config.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java index 2444deab..ff5f48f6 100644 --- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java +++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java @@ -84,13 +84,13 @@ public void run() { // execute valid response to engine Response response = producer.send(tag, sub_tag, data); -// out.writeUTF(new JSONObject() -// .put("response", "200") -// .put("code", response.code()) -// .put("message", response.message()) -// .put("data", response.data()) -// .toString()); -// out.flush(); + out.writeUTF(new JSONObject() + .put("response", "200") + .put("code", response.code()) + .put("message", response.message()) + .put("data", response.data()) + .toString()); + out.flush(); } catch(Exception e) { break; @@ -204,9 +204,9 @@ private static boolean synced(String key) { private static final String readLine(DataInputStream in) throws IOException { StringBuilder out = new StringBuilder(); char c = 0; - while((c = (char)in.read()) != 10) + while((c = (char)in.read()) != 10) { out.append(c); - + } return out.toString(); } } 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 fede1005..b64cd4a8 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 @@ -21,7 +21,7 @@ public class Config { properties.put("app", app_properties); Properties stream_properties = new Properties(); - stream_properties.put("general.consumer.types", "socket_consumer"); + stream_properties.put("general.consumer.types", "null"); stream_properties.put("general.producer.types", "socket_producer"); stream_properties.put("rest.socket.address", "DataEngine"); //stream_properties.put("rest.socket.address", "localhost"); From adc6cea4a63e5415136be41d61be3ced80127c6a Mon Sep 17 00:00:00 2001 From: Conor Flynn Date: Tue, 21 Mar 2023 14:51:10 -0400 Subject: [PATCH 2/3] add .gitignore --- DeFi-Data-Engine/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 DeFi-Data-Engine/.gitignore diff --git a/DeFi-Data-Engine/.gitignore b/DeFi-Data-Engine/.gitignore new file mode 100644 index 00000000..9190a975 --- /dev/null +++ b/DeFi-Data-Engine/.gitignore @@ -0,0 +1 @@ +'Testing Environment'/ \ No newline at end of file From 982b5f24d1c21605c1470bcb9bf394535e1fcbc9 Mon Sep 17 00:00:00 2001 From: Conor Flynn Date: Tue, 21 Mar 2023 14:53:37 -0400 Subject: [PATCH 3/3] stable commit for API Handler Integration --- .../src/main/java/org/core/engine/Engine.java | 7 +++---- .../java/org/out/producers/SocketProducer.java | 3 ++- .../src/main/java/org/properties/Config.java | 4 ++-- DeFi-Data-Engine/docker-compose.yml | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) 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