Colored logs, YAYYYYY
This commit is contained in:
@@ -50,6 +50,12 @@
|
|||||||
<artifactId>log4j-core</artifactId>
|
<artifactId>log4j-core</artifactId>
|
||||||
<version>2.24.2</version>
|
<version>2.24.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-layout-template-json</artifactId>
|
||||||
|
<version>2.24.2</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -19,10 +19,10 @@ public class Main {
|
|||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
try {
|
try {
|
||||||
logger.info("Node up.");
|
logger.info("Node up. - OK");
|
||||||
EntityManager em = Data.getEntityManager();
|
EntityManager em = Data.getEntityManager();
|
||||||
|
|
||||||
logger.info("Connected to database: << symphony >>");
|
logger.info("Connected to database: << symphony >> - OK");
|
||||||
em.close();
|
em.close();
|
||||||
|
|
||||||
try (HttpClient client = HttpClient.newHttpClient()) {
|
try (HttpClient client = HttpClient.newHttpClient()) {
|
||||||
@@ -33,7 +33,7 @@ public class Main {
|
|||||||
public CompletionStage<?> onText(WebSocket webSocket, CharSequence data, boolean last) {
|
public CompletionStage<?> onText(WebSocket webSocket, CharSequence data, boolean last) {
|
||||||
try {
|
try {
|
||||||
int nodeCount = Integer.parseInt(data.toString());
|
int nodeCount = Integer.parseInt(data.toString());
|
||||||
logger.info("Acknowledged system nodes: {}", nodeCount);
|
logger.info("Acknowledged nodes: {} - OK", nodeCount);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
logger.error("Received invalid node count: {}", data);
|
logger.error("Received invalid node count: {}", data);
|
||||||
}
|
}
|
||||||
@@ -42,7 +42,7 @@ public class Main {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onOpen(WebSocket webSocket) {
|
public void onOpen(WebSocket webSocket) {
|
||||||
logger.info("Successfully registered to Discovery");
|
logger.info("Successfully registered to Discovery - OK");
|
||||||
waitForConnection.countDown();
|
waitForConnection.countDown();
|
||||||
WebSocket.Listener.super.onOpen(webSocket);
|
WebSocket.Listener.super.onOpen(webSocket);
|
||||||
}
|
}
|
||||||
@@ -66,7 +66,7 @@ public class Main {
|
|||||||
waitForConnection.await();
|
waitForConnection.await();
|
||||||
Thread.currentThread().join();
|
Thread.currentThread().join();
|
||||||
} finally {
|
} finally {
|
||||||
ws.sendClose(WebSocket.NORMAL_CLOSURE, "Node shutting down").join();
|
ws.sendClose(WebSocket.NORMAL_CLOSURE, "Node shutting down. - OK").join();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,9 @@
|
|||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="Console" target="SYSTEM_OUT">
|
<Console name="Console" target="SYSTEM_OUT">
|
||||||
<PatternLayout>
|
<PatternLayout>
|
||||||
<Pattern>%d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n</Pattern>
|
<Pattern>
|
||||||
|
%highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
|
||||||
|
</Pattern>
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</Console>
|
</Console>
|
||||||
</Appenders>
|
</Appenders>
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ import java.util.concurrent.ScheduledExecutorService;
|
|||||||
|
|
||||||
public class JavalinConfig {
|
public class JavalinConfig {
|
||||||
private static final Map<String, WsContext> users = new ConcurrentHashMap<>();
|
private static final Map<String, WsContext> 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 -> {
|
ws.onConnect(ctx -> {
|
||||||
String id = ctx.sessionId();
|
String id = ctx.sessionId();
|
||||||
users.put(id, ctx);
|
users.put(id, ctx);
|
||||||
|
|||||||
@@ -2,11 +2,15 @@ package io.github.lumijiez;
|
|||||||
|
|
||||||
import io.javalin.Javalin;
|
import io.javalin.Javalin;
|
||||||
import io.javalin.json.JavalinGson;
|
import io.javalin.json.JavalinGson;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
|
|
||||||
public class Main {
|
public class Main {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
Logger logger = LogManager.getLogger(Main.class);
|
||||||
|
|
||||||
Javalin app = Javalin.create(config -> {
|
Javalin app = Javalin.create(config -> {
|
||||||
config.jsonMapper(new JavalinGson());
|
config.jsonMapper(new JavalinGson());
|
||||||
config.jetty.modifyWebSocketServletFactory(wsFactoryConfig -> {
|
config.jetty.modifyWebSocketServletFactory(wsFactoryConfig -> {
|
||||||
@@ -16,6 +20,6 @@ public class Main {
|
|||||||
|
|
||||||
JavalinConfig.setup(app);
|
JavalinConfig.setup(app);
|
||||||
|
|
||||||
System.out.print("Discovery service up and running");
|
logger.info("Discovery service up and running. - OK");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,9 @@
|
|||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="Console" target="SYSTEM_OUT">
|
<Console name="Console" target="SYSTEM_OUT">
|
||||||
<PatternLayout>
|
<PatternLayout>
|
||||||
<Pattern>%d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n</Pattern>
|
<Pattern>
|
||||||
|
%highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
|
||||||
|
</Pattern>
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</Console>
|
</Console>
|
||||||
</Appenders>
|
</Appenders>
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class BrokerConnector {
|
|||||||
Channel channel = connection.createChannel()) {
|
Channel channel = connection.createChannel()) {
|
||||||
|
|
||||||
channel.queueDeclare(QUEUE_NAME, false, false, false, null);
|
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);
|
DeliverCallback deliverCallback = (consumerTag, delivery) -> channel.basicAck(delivery.getEnvelope().getDeliveryTag(), false);
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,9 @@
|
|||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="Console" target="SYSTEM_OUT">
|
<Console name="Console" target="SYSTEM_OUT">
|
||||||
<PatternLayout>
|
<PatternLayout>
|
||||||
<Pattern>%d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n</Pattern>
|
<Pattern>
|
||||||
|
%highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
|
||||||
|
</Pattern>
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</Console>
|
</Console>
|
||||||
</Appenders>
|
</Appenders>
|
||||||
|
|||||||
@@ -27,12 +27,12 @@ public class BrokerConnector {
|
|||||||
CountDownLatch latch = new CountDownLatch(1);
|
CountDownLatch latch = new CountDownLatch(1);
|
||||||
|
|
||||||
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
|
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
|
||||||
logger.info("Shutdown signal received.");
|
logger.info("Shutdown signal received. - OK");
|
||||||
latch.countDown();
|
latch.countDown();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
boolean success = connectToRabbitMQ(latch);
|
boolean success = connectToRabbitMQ(latch);
|
||||||
logger.info("Success: {}", success);
|
logger.info("Success: {} - OK", success);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean connectToRabbitMQ(CountDownLatch latch) {
|
private static boolean connectToRabbitMQ(CountDownLatch latch) {
|
||||||
@@ -46,7 +46,7 @@ public class BrokerConnector {
|
|||||||
ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor()) {
|
ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor()) {
|
||||||
|
|
||||||
channel.queueDeclare(QUEUE_NAME, false, false, false, null);
|
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(() -> {
|
scheduler.scheduleAtFixedRate(() -> {
|
||||||
try {
|
try {
|
||||||
@@ -63,7 +63,7 @@ public class BrokerConnector {
|
|||||||
|
|
||||||
return scheduler.awaitTermination(5, TimeUnit.SECONDS);
|
return scheduler.awaitTermination(5, TimeUnit.SECONDS);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.info("Awaiting broker connection: {}", e.getMessage());
|
logger.error("Awaiting broker connection: {}", e.getMessage());
|
||||||
try {
|
try {
|
||||||
Thread.sleep(5000);
|
Thread.sleep(5000);
|
||||||
connectToRabbitMQ(latch);
|
connectToRabbitMQ(latch);
|
||||||
|
|||||||
@@ -3,7 +3,9 @@
|
|||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="Console" target="SYSTEM_OUT">
|
<Console name="Console" target="SYSTEM_OUT">
|
||||||
<PatternLayout>
|
<PatternLayout>
|
||||||
<Pattern>%d{yyyy-MM-dd HH:mm:ss} [%t] %-5level: %msg%n</Pattern>
|
<Pattern>
|
||||||
|
%highlight{%d{yyyy-MM-dd HH:mm:ss} %-5level [%t]: %msg}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue}%n
|
||||||
|
</Pattern>
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</Console>
|
</Console>
|
||||||
</Appenders>
|
</Appenders>
|
||||||
|
|||||||
Reference in New Issue
Block a user