remove jline and adjust logging

This commit is contained in:
2025-02-06 11:54:13 +01:00
parent 2b3423c1c9
commit 614ca976b9
5 changed files with 3 additions and 44 deletions

View File

@@ -32,7 +32,6 @@ dependencies {
implementation(libs.logback)
implementation(libs.log4jtoslf4j)
implementation(libs.jultoslf4j)
implementation(libs.jline)
implementation(libs.marinaralib)
implementation(libs.marinarajavacord)

View File

@@ -1,12 +1,8 @@
package net.tomatentum.tomatenmusic3;
import java.io.IOException;
import org.javacord.api.DiscordApi;
import org.javacord.api.DiscordApiBuilder;
import org.javacord.api.entity.intent.Intent;
import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +22,6 @@ public class App {
private Config config;
private DiscordApi client;
private Logger logger = LoggerFactory.getLogger(getClass());
private Terminal terminal;
private Marinara marinara;
@@ -37,7 +32,6 @@ public class App {
LoggerContext loggerctx = (LoggerContext) LoggerFactory.getILoggerFactory();
if (config.isDevelopment())
loggerctx.getLogger("root").setLevel(Level.DEBUG);
initJline();
}
public void connect() {
@@ -49,15 +43,6 @@ public class App {
logger.info("connected as {}", client.getYourself().getName());
}
private void initJline() {
try {
this.terminal = TerminalBuilder.terminal();
} catch (IOException e) {
e.printStackTrace();
}
JlineAppender.Terminal = this.terminal;
}
private void initMarinara() {
this.marinara = Marinara.load(new JavacordWrapper(client));

View File

@@ -1,21 +0,0 @@
package net.tomatentum.tomatenmusic3;
import java.io.PrintWriter;
import org.jline.terminal.Terminal;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.ConsoleAppender;
public class JlineAppender extends ConsoleAppender<ILoggingEvent> {
public static Terminal Terminal;
@Override
protected void append(ILoggingEvent event) {
PrintWriter terminalWriter = Terminal.writer();
terminalWriter.write(new String(super.encoder.encode(event)));
terminalWriter.flush();
}
}

View File

@@ -1,11 +1,11 @@
<configuration>
<appender name="jline" class="net.tomatentum.tomatenmusic3.JlineAppender">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{STRICT} %-30.-30t %-56([%boldWhite(%logger{40})]) %highlight(%p): %msg%n</pattern>
<pattern>%d{STRICT} %-20.-20t %-46([%boldWhite(%logger{30})]) %highlight(%p): %msg%n</pattern>
</encoder>
</appender>
<root level="info">
<appender-ref ref="jline" />
<appender-ref ref="STDOUT" />
</root>
</configuration>