diff --git a/SymphonyDatabaseNode/pom.xml b/SymphonyDatabaseNode/pom.xml
index 0fe6c02..ddeb1e4 100644
--- a/SymphonyDatabaseNode/pom.xml
+++ b/SymphonyDatabaseNode/pom.xml
@@ -50,6 +50,12 @@
log4j-core
2.24.2
+
+
+ org.apache.logging.log4j
+ log4j-layout-template-json
+ 2.24.2
+
diff --git a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java
index 2952497..bbb4455 100644
--- a/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java
+++ b/SymphonyDatabaseNode/src/main/java/io/github/lumijiez/Main.java
@@ -19,10 +19,10 @@ public class Main {
public static void main(String[] args) {
try {
- logger.info("Node up.");
+ logger.info("Node up. - OK");
EntityManager em = Data.getEntityManager();
- logger.info("Connected to database: << symphony >>");
+ logger.info("Connected to database: << symphony >> - OK");
em.close();
try (HttpClient client = HttpClient.newHttpClient()) {
@@ -33,7 +33,7 @@ public class Main {
public CompletionStage onText(WebSocket webSocket, CharSequence data, boolean last) {
try {
int nodeCount = Integer.parseInt(data.toString());
- logger.info("Acknowledged system nodes: {}", nodeCount);
+ logger.info("Acknowledged nodes: {} - OK", nodeCount);
} catch (NumberFormatException e) {
logger.error("Received invalid node count: {}", data);
}
@@ -42,7 +42,7 @@ public class Main {
@Override
public void onOpen(WebSocket webSocket) {
- logger.info("Successfully registered to Discovery");
+ logger.info("Successfully registered to Discovery - OK");
waitForConnection.countDown();
WebSocket.Listener.super.onOpen(webSocket);
}
@@ -66,7 +66,7 @@ public class Main {
waitForConnection.await();
Thread.currentThread().join();
} finally {
- ws.sendClose(WebSocket.NORMAL_CLOSURE, "Node shutting down").join();
+ ws.sendClose(WebSocket.NORMAL_CLOSURE, "Node shutting down. - OK").join();
}
}
diff --git a/SymphonyDatabaseNode/src/main/resources/log4j2.xml b/SymphonyDatabaseNode/src/main/resources/log4j2.xml
index e4cd602..b5c1d56 100644
--- a/SymphonyDatabaseNode/src/main/resources/log4j2.xml
+++ b/SymphonyDatabaseNode/src/main/resources/log4j2.xml
@@ -3,7 +3,9 @@
- %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n
+
+ %highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
+
diff --git a/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java b/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java
index a4bb1a8..2d33b16 100644
--- a/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java
+++ b/SymphonyDiscovery/src/main/java/io/github/lumijiez/JavalinConfig.java
@@ -11,9 +11,9 @@ import java.util.concurrent.ScheduledExecutorService;
public class JavalinConfig {
private static final Map users = new ConcurrentHashMap<>();
- private static final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
- public static void setup(Javalin app) { app.ws("/discovery", ws -> {
+ public static void setup(Javalin app) {
+ app.ws("/discovery", ws -> {
ws.onConnect(ctx -> {
String id = ctx.sessionId();
users.put(id, ctx);
diff --git a/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java b/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java
index 4842411..47014ac 100644
--- a/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java
+++ b/SymphonyDiscovery/src/main/java/io/github/lumijiez/Main.java
@@ -2,11 +2,15 @@ package io.github.lumijiez;
import io.javalin.Javalin;
import io.javalin.json.JavalinGson;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import java.time.Duration;
public class Main {
public static void main(String[] args) {
+ Logger logger = LogManager.getLogger(Main.class);
+
Javalin app = Javalin.create(config -> {
config.jsonMapper(new JavalinGson());
config.jetty.modifyWebSocketServletFactory(wsFactoryConfig -> {
@@ -16,6 +20,6 @@ public class Main {
JavalinConfig.setup(app);
- System.out.print("Discovery service up and running");
+ logger.info("Discovery service up and running. - OK");
}
}
\ No newline at end of file
diff --git a/SymphonyDiscovery/src/main/resources/log4j2.xml b/SymphonyDiscovery/src/main/resources/log4j2.xml
index e46f5e0..44ca4f0 100644
--- a/SymphonyDiscovery/src/main/resources/log4j2.xml
+++ b/SymphonyDiscovery/src/main/resources/log4j2.xml
@@ -3,7 +3,9 @@
- %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n
+
+ %highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
+
diff --git a/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java b/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java
index 873e23f..76ea885 100644
--- a/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java
+++ b/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java
@@ -47,7 +47,7 @@ public class BrokerConnector {
Channel channel = connection.createChannel()) {
channel.queueDeclare(QUEUE_NAME, false, false, false, null);
- logger.info("Connected to RabbitMQ and queue declared.");
+ logger.info("Connected to RabbitMQ and queue declared. - OK");
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
index b293a80..75ee285 100644
--- a/SymphonyManager/src/main/resources/log4j2.xml
+++ b/SymphonyManager/src/main/resources/log4j2.xml
@@ -3,7 +3,9 @@
- %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n
+
+ %highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
+
diff --git a/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java b/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java
index 9fee17c..516e3da 100644
--- a/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java
+++ b/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java
@@ -27,12 +27,12 @@ public class BrokerConnector {
CountDownLatch latch = new CountDownLatch(1);
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
- logger.info("Shutdown signal received.");
+ logger.info("Shutdown signal received. - OK");
latch.countDown();
}));
boolean success = connectToRabbitMQ(latch);
- logger.info("Success: {}", success);
+ logger.info("Success: {} - OK", success);
}
private static boolean connectToRabbitMQ(CountDownLatch latch) {
@@ -46,7 +46,7 @@ public class BrokerConnector {
ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor()) {
channel.queueDeclare(QUEUE_NAME, false, false, false, null);
- logger.info("Connected to RabbitMQ and queue declared.");
+ logger.info("Connected to RabbitMQ and queue declared. - OK");
scheduler.scheduleAtFixedRate(() -> {
try {
@@ -63,7 +63,7 @@ public class BrokerConnector {
return scheduler.awaitTermination(5, TimeUnit.SECONDS);
} catch (Exception e) {
- logger.info("Awaiting broker connection: {}", e.getMessage());
+ logger.error("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
index b293a80..75ee285 100644
--- a/SymphonyProducer/src/main/resources/log4j2.xml
+++ b/SymphonyProducer/src/main/resources/log4j2.xml
@@ -3,7 +3,9 @@
- %d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n
+
+ %highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
+