Removed useless 'nothing' debug level. Reordered levels indices. Moved Logger under server package and make setLevel method package-private

This commit is contained in:
Nanit 2022-02-07 11:23:16 +02:00
parent 4c2ad07049
commit f726a21e2c
10 changed files with 22 additions and 25 deletions

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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<Packet> {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
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;

View File

@ -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;

View File

@ -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: