diff --git a/src/main/java/ru/nanit/limbo/NanoLimbo.java b/src/main/java/ru/nanit/limbo/NanoLimbo.java index 0ea15d4..dbcee42 100644 --- a/src/main/java/ru/nanit/limbo/NanoLimbo.java +++ b/src/main/java/ru/nanit/limbo/NanoLimbo.java @@ -18,7 +18,7 @@ package ru.nanit.limbo; import ru.nanit.limbo.server.LimboServer; -import ru.nanit.limbo.util.Logger; +import ru.nanit.limbo.server.Logger; public final class NanoLimbo { diff --git a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java index 33cf9c4..eec50cd 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java @@ -41,7 +41,7 @@ import ru.nanit.limbo.protocol.registry.State; import ru.nanit.limbo.protocol.registry.Version; import ru.nanit.limbo.server.LimboServer; import ru.nanit.limbo.server.data.Title; -import ru.nanit.limbo.util.Logger; +import ru.nanit.limbo.server.Logger; import ru.nanit.limbo.util.UuidUtil; import javax.crypto.Mac; diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java index cdc0702..c259133 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java @@ -24,7 +24,7 @@ import ru.nanit.limbo.protocol.ByteMessage; import ru.nanit.limbo.protocol.Packet; import ru.nanit.limbo.protocol.registry.State; import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.util.Logger; +import ru.nanit.limbo.server.Logger; import java.util.List; diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java index 78e5f4c..ab8289f 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java @@ -25,7 +25,7 @@ import ru.nanit.limbo.protocol.Packet; import ru.nanit.limbo.protocol.PacketSnapshot; import ru.nanit.limbo.protocol.registry.State; import ru.nanit.limbo.protocol.registry.Version; -import ru.nanit.limbo.util.Logger; +import ru.nanit.limbo.server.Logger; public class PacketEncoder extends MessageToByteEncoder { diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java index 861fb64..4160928 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java @@ -20,7 +20,7 @@ package ru.nanit.limbo.connection.pipeline; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; -import ru.nanit.limbo.util.Logger; +import ru.nanit.limbo.server.Logger; import java.util.List; diff --git a/src/main/java/ru/nanit/limbo/server/Connections.java b/src/main/java/ru/nanit/limbo/server/Connections.java index 0cc4a7b..61e9c04 100644 --- a/src/main/java/ru/nanit/limbo/server/Connections.java +++ b/src/main/java/ru/nanit/limbo/server/Connections.java @@ -18,7 +18,6 @@ package ru.nanit.limbo.server; import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.util.Logger; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/ru/nanit/limbo/server/LimboServer.java b/src/main/java/ru/nanit/limbo/server/LimboServer.java index 8cd38f7..ba8fc8e 100644 --- a/src/main/java/ru/nanit/limbo/server/LimboServer.java +++ b/src/main/java/ru/nanit/limbo/server/LimboServer.java @@ -30,7 +30,6 @@ import io.netty.util.ResourceLeakDetector; import ru.nanit.limbo.configuration.LimboConfig; import ru.nanit.limbo.connection.ClientChannelInitializer; import ru.nanit.limbo.connection.ClientConnection; -import ru.nanit.limbo.util.Logger; import ru.nanit.limbo.world.dimension.DimensionRegistry; import java.nio.file.Paths; diff --git a/src/main/java/ru/nanit/limbo/util/Logger.java b/src/main/java/ru/nanit/limbo/server/Logger.java similarity index 91% rename from src/main/java/ru/nanit/limbo/util/Logger.java rename to src/main/java/ru/nanit/limbo/server/Logger.java index 947aacb..91deb17 100644 --- a/src/main/java/ru/nanit/limbo/util/Logger.java +++ b/src/main/java/ru/nanit/limbo/server/Logger.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package ru.nanit.limbo.util; +package ru.nanit.limbo.server; import java.time.LocalTime; import java.time.format.DateTimeFormatter; @@ -23,14 +23,10 @@ import java.time.format.DateTimeFormatter; public final class Logger { private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("hh:mm:ss"); - private static int debugLevel = 3; + private static int debugLevel = Level.ERROR.getIndex(); private Logger() {} - public static void setLevel(int level) { - debugLevel = level; - } - public static int getLevel() { return debugLevel; } @@ -74,12 +70,16 @@ public final class Logger { return LocalTime.now().format(FORMATTER); } + static void setLevel(int level) { + debugLevel = level; + } + public enum Level { - ERROR("ERROR", 1), - WARNING("WARNING", 2), - INFO ("INFO", 3), - DEBUG ("DEBUG", 4); + ERROR("ERROR", 0), + WARNING("WARNING", 1), + INFO ("INFO", 2), + DEBUG ("DEBUG", 3); private final String display; private final int index; diff --git a/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java b/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java index 60c07b3..bac9a77 100644 --- a/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java +++ b/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java @@ -21,7 +21,7 @@ import net.kyori.adventure.nbt.CompoundBinaryTag; import net.kyori.adventure.nbt.ListBinaryTag; import net.kyori.adventure.nbt.TagStringIO; import ru.nanit.limbo.server.LimboServer; -import ru.nanit.limbo.util.Logger; +import ru.nanit.limbo.server.Logger; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/src/main/resources/settings.yml b/src/main/resources/settings.yml index b0d56fb..3bed986 100644 --- a/src/main/resources/settings.yml +++ b/src/main/resources/settings.yml @@ -97,14 +97,13 @@ infoForwarding: # Read timeout for connections in milliseconds readTimeout: 30000 -# Define log level. On release, I'd recommend to use level 3 +# Define log level. For production, I'd recommend to use level 2 # Log levels: -# 0 - Display nothing -# 1 - Display only errors -# 2 - Display errors, warnings -# 3 - Display errors, warnings, info -# 4 - Display errors, warnings, info, debug -debugLevel: 3 +# 0 - Display only errors +# 1 - Display errors, warnings +# 2 - Display errors, warnings, info +# 3 - Display errors, warnings, info, debug +debugLevel: 2 # Warning! Do not touch params of this block, if you not completely sure what is this! netty: