diff --git a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java index 6b29dc3..0167d8e 100644 --- a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java +++ b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java @@ -4,14 +4,33 @@ import jakarta.persistence.EntityManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; + public class Main { public static Logger logger = LogManager.getLogger(Main.class); - public static void main(String[] args) { + public static void main(String[] args) throws URISyntaxException, IOException, InterruptedException { + HttpClient client = HttpClient.newHttpClient(); + logger.info("Node up."); EntityManager em = Data.getEntityManager(); logger.info("Connected to database: << symphony >>"); em.close(); + + HttpRequest request = HttpRequest.newBuilder() + .uri(new URI("http://symphony-discovery:8083/check")) + .build(); + + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + + if (response.statusCode() == 200) { + logger.info("Node successfully registered to Discovery"); + } } } \ No newline at end of file diff --git a/SymphonyDiscovery/pom.xml b/SymphonyDiscovery/pom.xml index da806f9..c6d7b4b 100644 --- a/SymphonyDiscovery/pom.xml +++ b/SymphonyDiscovery/pom.xml @@ -32,6 +32,12 @@ javalin 6.3.0 + + + org.slf4j + slf4j-simple + 2.0.16 + diff --git a/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java b/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java index a4e0910..bb768b9 100644 --- a/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java +++ b/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java @@ -7,7 +7,6 @@ public class Main { Javalin app = Javalin.create().start(8083); JavalinConfig.setup(app); - System.out.print("Discovery service up and running"); } } \ No newline at end of file diff --git a/SymphonyDiscovery/src/main/resources/log4j2.xml b/SymphonyDiscovery/src/main/resources/log4j2.xml index b293a80..e46f5e0 100644 --- a/SymphonyDiscovery/src/main/resources/log4j2.xml +++ b/SymphonyDiscovery/src/main/resources/log4j2.xml @@ -9,6 +9,9 @@ + + + diff --git a/SymphonyDiscovery/src/main/resources/simplelogger.properties b/SymphonyDiscovery/src/main/resources/simplelogger.properties new file mode 100644 index 0000000..b6c5c5b --- /dev/null +++ b/SymphonyDiscovery/src/main/resources/simplelogger.properties @@ -0,0 +1,20 @@ +org.slf4j.simpleLogger.defaultLogLevel=off + +org.slf4j.simpleLogger.log.io.javalin=off + +org.slf4j.simpleLogger.log.org.eclipse.jetty=off +org.slf4j.simpleLogger.log.org.eclipse.jetty.server=off +org.slf4j.simpleLogger.log.org.eclipse.jetty.util=off + +# org.slf4j.simpleLogger.log.org.springframework=off +# org.slf4j.simpleLogger.log.org.hibernate=off + +org.slf4j.simpleLogger.showDateTime=true + +org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z + +org.slf4j.simpleLogger.showThreadName=true + +org.slf4j.simpleLogger.showLogName=true + +org.slf4j.simpleLogger.showShortLogName=false diff --git a/docker-compose.yml b/docker-compose.yml index 98df3a5..cdf0e73 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,12 +36,12 @@ services: - postgres_db symphony-dbnode1: - container_name: dbnode1 + container_name: node1 build: context: ./SymphonyDatabaseNode dockerfile: Dockerfile ports: - - "8084:8084" + - "8100:8100" networks: - symphony-network depends_on: @@ -49,12 +49,51 @@ services: - symphony-discovery symphony-dbnode2: - container_name: dbnode2 + container_name: node2 build: context: ./SymphonyDatabaseNode dockerfile: Dockerfile ports: - - "8085:8085" + - "8101:8101" + networks: + - symphony-network + depends_on: + - postgres_db + - symphony-discovery + + symphony-dbnode3: + container_name: node3 + build: + context: ./SymphonyDatabaseNode + dockerfile: Dockerfile + ports: + - "8102:8102" + networks: + - symphony-network + depends_on: + - postgres_db + - symphony-discovery + + symphony-dbnode4: + container_name: node4 + build: + context: ./SymphonyDatabaseNode + dockerfile: Dockerfile + ports: + - "8103:8103" + networks: + - symphony-network + depends_on: + - postgres_db + - symphony-discovery + + symphony-dbnode5: + container_name: node5 + build: + context: ./SymphonyDatabaseNode + dockerfile: Dockerfile + ports: + - "8104:8104" networks: - symphony-network depends_on: