From cd4fd4938a088b7ea4010fab84510e0bbd059e54 Mon Sep 17 00:00:00 2001 From: nathanrsxtn Date: Tue, 1 Mar 2022 18:15:27 -0700 Subject: [PATCH] Fix logging colored messages with colored logger --- src/main/java/frc4388/robot/subsystems/BoomBoom.java | 4 +++- src/main/java/frc4388/utility/AnsiLogging.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc4388/robot/subsystems/BoomBoom.java b/src/main/java/frc4388/robot/subsystems/BoomBoom.java index 64e7027..7e9a710 100644 --- a/src/main/java/frc4388/robot/subsystems/BoomBoom.java +++ b/src/main/java/frc4388/robot/subsystems/BoomBoom.java @@ -10,6 +10,7 @@ import java.util.Comparator; import java.util.Map; import java.util.Optional; import java.util.function.Function; +import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.stream.IntStream; @@ -24,6 +25,7 @@ import frc4388.utility.CSV; import frc4388.utility.Gains; public class BoomBoom extends SubsystemBase { + private static final Logger LOGGER = Logger.getLogger(BoomBoom.class.getSimpleName()); public WPI_TalonFX m_shooterFalconLeft; public WPI_TalonFX m_shooterFalconRight; public static Gains m_drumShooterGains = ShooterConstants.DRUM_SHOOTER_GAINS; @@ -66,7 +68,7 @@ public class BoomBoom extends SubsystemBase { }; m_shooterTable = csv.read(new File(Filesystem.getDeployDirectory(), "Robot Data - Distances.csv").toPath()); - new Thread(() -> System.out.println(CSV.ReflectionTable.create(m_shooterTable, RobotBase.isSimulation()))).start(); + new Thread(() -> LOGGER.fine(CSV.ReflectionTable.create(m_shooterTable, RobotBase.isSimulation()))).start(); } catch (final IOException e) { e.printStackTrace(); // throw new RuntimeException(e); diff --git a/src/main/java/frc4388/utility/AnsiLogging.java b/src/main/java/frc4388/utility/AnsiLogging.java index 6708568..901e2d7 100644 --- a/src/main/java/frc4388/utility/AnsiLogging.java +++ b/src/main/java/frc4388/utility/AnsiLogging.java @@ -95,7 +95,7 @@ public class AnsiLogging extends ConsoleHandler { String message = formatMessage(logRecord); String throwable = Optional.ofNullable(logRecord.getThrown()).map(this::makeStackTraceString).orElse(""); String format = levelColors.getOrDefault(logRecord.getLevel().intValue(), levelColors.get(Level.ALL.intValue())); - return String.format(format, time, source, logRecord.getLevel().getLocalizedName(), message.lines().count() > 1 ? System.lineSeparator() : " ", message, throwable); + return String.format(format, time, source, logRecord.getLevel().getLocalizedName(), message.lines().count() > 1 ? System.lineSeparator() : " ", message.contains("\033") ? "\033[0m" + message : message, throwable); } }; }