diff --git a/SymphonyDatabaseNode/pom.xml b/SymphonyDatabaseNode/pom.xml index b1f6fd8..0fe6c02 100644 --- a/SymphonyDatabaseNode/pom.xml +++ b/SymphonyDatabaseNode/pom.xml @@ -34,6 +34,12 @@ 42.7.4 + + org.hibernate.orm + hibernate-c3p0 + 6.6.3.Final + + org.apache.logging.log4j log4j-api diff --git a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java index deedd96..6b29dc3 100644 --- a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java +++ b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java @@ -1,13 +1,17 @@ package io.github.lumijiez; import jakarta.persistence.EntityManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; public class Main { + public static Logger logger = LogManager.getLogger(Main.class); + public static void main(String[] args) { - System.out.println("Node up"); + logger.info("Node up."); EntityManager em = Data.getEntityManager(); - System.out.println("Connected to DB << symphony >>"); + logger.info("Connected to database: << symphony >>"); em.close(); } } \ No newline at end of file diff --git a/SymphonyDatabaseNode/src/main/resources/META-INF/persistence.xml b/SymphonyDatabaseNode/src/main/resources/META-INF/persistence.xml index cb2e254..1eba1f6 100644 --- a/SymphonyDatabaseNode/src/main/resources/META-INF/persistence.xml +++ b/SymphonyDatabaseNode/src/main/resources/META-INF/persistence.xml @@ -17,8 +17,6 @@ - - diff --git a/SymphonyDatabaseNode/src/main/resources/log4j2.xml b/SymphonyDatabaseNode/src/main/resources/log4j2.xml new file mode 100644 index 0000000..e4cd602 --- /dev/null +++ b/SymphonyDatabaseNode/src/main/resources/log4j2.xml @@ -0,0 +1,20 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n + + + + + + + + + + + + + + diff --git a/SymphonyDiscovery/pom.xml b/SymphonyDiscovery/pom.xml index 2d0bf06..ffde897 100644 --- a/SymphonyDiscovery/pom.xml +++ b/SymphonyDiscovery/pom.xml @@ -15,6 +15,17 @@ gson 2.11.0 + + + org.apache.logging.log4j + log4j-api + 2.24.2 + + + org.apache.logging.log4j + log4j-core + 2.24.2 + diff --git a/SymphonyDiscovery/src/main/resources/log4j2.xml b/SymphonyDiscovery/src/main/resources/log4j2.xml new file mode 100644 index 0000000..b293a80 --- /dev/null +++ b/SymphonyDiscovery/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n + + + + + + + + + + diff --git a/SymphonyManager/pom.xml b/SymphonyManager/pom.xml index e952658..cd08f82 100644 --- a/SymphonyManager/pom.xml +++ b/SymphonyManager/pom.xml @@ -45,6 +45,17 @@ slf4j-simple 1.7.32 + + + org.apache.logging.log4j + log4j-api + 2.24.2 + + + org.apache.logging.log4j + log4j-core + 2.24.2 + diff --git a/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java b/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java index 03d972b..a4c9870 100644 --- a/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java +++ b/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java @@ -4,8 +4,9 @@ import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.DeliverCallback; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -17,6 +18,7 @@ public class BrokerConnector { private static final String RABBITMQ_USER = "symphony"; private static final String RABBITMQ_PASSWORD = "symphony"; private static final CountDownLatch shutdownLatch = new CountDownLatch(1); + private static final Logger logger = LogManager.getLogger(BrokerConnector.class); public static void connect() { try (ScheduledExecutorService reconnectExecutor = Executors.newSingleThreadScheduledExecutor()) { @@ -24,14 +26,14 @@ public class BrokerConnector { try { connectToRabbitMQ(); } catch (Exception e) { - System.err.println("Awaiting broker connection: " + e.getMessage()); + logger.error("Awaiting broker connection: {}", e.getMessage()); } }, 0, 5, TimeUnit.SECONDS); shutdownLatch.await(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - System.err.println("Connector interrupted: " + e.getMessage()); + logger.error("Connector interrupted: {}", e.getMessage()); } } @@ -45,7 +47,7 @@ public class BrokerConnector { Channel channel = connection.createChannel()) { channel.queueDeclare(QUEUE_NAME, false, false, false, null); - System.out.println("Connected to RabbitMQ and queue declared."); + logger.info("Connected to RabbitMQ and queue declared."); DeliverCallback deliverCallback = (consumerTag, delivery) -> { channel.basicAck(delivery.getEnvelope().getDeliveryTag(), false); diff --git a/SymphonyManager/src/main/resources/log4j2.xml b/SymphonyManager/src/main/resources/log4j2.xml new file mode 100644 index 0000000..b293a80 --- /dev/null +++ b/SymphonyManager/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n + + + + + + + + + + diff --git a/SymphonyProducer/pom.xml b/SymphonyProducer/pom.xml index 3c865e1..c6c6c50 100644 --- a/SymphonyProducer/pom.xml +++ b/SymphonyProducer/pom.xml @@ -45,6 +45,17 @@ slf4j-simple 1.7.32 + + + org.apache.logging.log4j + log4j-api + 2.24.2 + + + org.apache.logging.log4j + log4j-core + 2.24.2 + diff --git a/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java b/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java index 394eee5..9fee17c 100644 --- a/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java +++ b/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java @@ -13,23 +13,26 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class BrokerConnector { private static final String QUEUE_NAME = "random_json_queue"; private static final String RABBITMQ_HOST = "rabbitmq"; private static final String RABBITMQ_USER = "symphony"; private static final String RABBITMQ_PASSWORD = "symphony"; + private static final Logger logger = LogManager.getLogger(BrokerConnector.class); public static void connect() { CountDownLatch latch = new CountDownLatch(1); Runtime.getRuntime().addShutdownHook(new Thread(() -> { - System.out.println("Shutdown signal received."); + logger.info("Shutdown signal received."); latch.countDown(); })); boolean success = connectToRabbitMQ(latch); - System.out.println("Success: " + success); + logger.info("Success: {}", success); } private static boolean connectToRabbitMQ(CountDownLatch latch) { @@ -43,7 +46,7 @@ public class BrokerConnector { ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor()) { channel.queueDeclare(QUEUE_NAME, false, false, false, null); - System.out.println("Connected to RabbitMQ and queue declared."); + logger.info("Connected to RabbitMQ and queue declared."); scheduler.scheduleAtFixedRate(() -> { try { @@ -51,7 +54,7 @@ public class BrokerConnector { channel.basicPublish("", QUEUE_NAME, null, jsonMessage.getBytes(StandardCharsets.UTF_8)); // System.out.println("Sent: " + jsonMessage); } catch (IOException e) { - System.err.println("Failed to send message: " + e.getMessage()); + logger.error("Failed to send message: {}", e.getMessage()); } }, 0, 1, TimeUnit.SECONDS); @@ -60,7 +63,7 @@ public class BrokerConnector { return scheduler.awaitTermination(5, TimeUnit.SECONDS); } catch (Exception e) { - System.err.println("Awaiting broker connection: " + e.getMessage()); + logger.info("Awaiting broker connection: {}", e.getMessage()); try { Thread.sleep(5000); connectToRabbitMQ(latch); diff --git a/SymphonyProducer/src/main/resources/log4j2.xml b/SymphonyProducer/src/main/resources/log4j2.xml new file mode 100644 index 0000000..b293a80 --- /dev/null +++ b/SymphonyProducer/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n + + + + + + + + + + diff --git a/docker-compose.yml b/docker-compose.yml index 973662e..98df3a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,6 +46,7 @@ services: - symphony-network depends_on: - postgres_db + - symphony-discovery symphony-dbnode2: container_name: dbnode2 @@ -58,6 +59,7 @@ services: - symphony-network depends_on: - postgres_db + - symphony-discovery postgres_db: image: postgres:latest diff --git a/run.sh b/run.sh new file mode 100644 index 0000000..2c2cd62 --- /dev/null +++ b/run.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo docker compose up --no-attach postgres_db --no-attach rabbitmq --no-attach prometheus --no-attach grafana --no-attach node-exporter \ No newline at end of file