日志代码优化

acgist · acgist · commit 9a4349fbc4b7 · 2020-12-04T17:09:51.000+08:00
diff --git a/README.md b/README.md
@@ -141,7 +141,6 @@ javaw -server -Xms128m -Xmx256m -jar snail.javafx-{version}.jar
 |:--|:--:|:--|
 |[h2](http://www.h2database.com)|[License](http://www.h2database.com/html/license.html)|MPL 2.0/EPL 1.0|
 |[slf4j](https://www.slf4j.org)|[License](https://www.slf4j.org/license.html)|MIT|
-|[logback](https://logback.qos.ch)|[License](https://logback.qos.ch/license.html)|LGPL 2.1/EPL 1.0|
 |[JavaFX](https://wiki.openjdk.java.net/display/OpenJFX/Main)|[License](http://openjdk.java.net/legal/gplv2+ce.html)|GPL 2.0|
 
 ## 视频播放
diff --git a/snail/src/main/java/com/acgist/snail/context/LoggerContext.java b/snail/src/main/java/com/acgist/snail/context/LoggerContext.java
@@ -37,9 +37,9 @@ public static final LoggerContext getInstance() {
 	private final List<LoggerAdapter> adapters;
 	
 	private LoggerContext() {
-		this.loggers = new ConcurrentHashMap<String, Logger>();
+		this.loggers = new ConcurrentHashMap<>();
 		final String adapter = LoggerConfig.getAdapter();
-		final List<LoggerAdapter> list = new ArrayList<LoggerAdapter>();
+		final List<LoggerAdapter> list = new ArrayList<>();
 		if(adapter != null && !adapter.isEmpty()) {
 			final String[] adapters = adapter.split(",");
 			for (String value : adapters) {
@@ -95,7 +95,7 @@ public void output(Level level, String message) {
 	 * <p>关闭日志</p>
 	 */
 	public static final void shutdown() {
-		INSTANCE.adapters.forEach(adapter -> adapter.release());
+		INSTANCE.adapters.forEach(LoggerAdapter::release);
 	}
 
 }
diff --git a/snail/src/main/java/com/acgist/snail/logger/Logger.java b/snail/src/main/java/com/acgist/snail/logger/Logger.java
@@ -31,25 +31,25 @@ public final class Logger implements org.slf4j.Logger {
 	 */
 	private final int level;
 	/**
-	 * <p>系统名称</p>
+	 * <p>日志名称</p>
 	 */
 	private final String name;
 	/**
-	 * <p>日志名称</p>
+	 * <p>日志系统名称</p>
 	 */
-	private final String logger;
+	private final String system;
 	/**
 	 * <p>日志上下文</p>
 	 */
 	private final LoggerContext context;
 	
 	/**
-	 * @param logger 日志名称
+	 * @param name 日志名称
 	 */
-	public Logger(String logger) {
+	public Logger(String name) {
+		this.name = name;
 		this.level = LoggerConfig.getLevelInt();
-		this.name = LoggerConfig.getName();
-		this.logger = logger;
+		this.system = LoggerConfig.getSystem();
 		this.context = LoggerContext.getInstance();
 	}
 	
@@ -73,11 +73,11 @@ public static final void error(Throwable t) {
 	private String format(Level level, FormattingTuple message) {
 		final StringBuilder builder = new StringBuilder();
 		builder
-			.append("[").append(this.name).append("]").append(" ")
-			.append(FORMATER.get().format(new Date())).append(" ")
-			.append(Thread.currentThread().getName()).append(" ")
+			.append("[").append(this.system).append("] ")
+			.append(FORMATER.get().format(new Date())).append(" [")
+			.append(Thread.currentThread().getName()).append("] ")
 			.append(level.name()).append(" ")
-			.append(this.logger).append(" ")
+			.append(this.name).append(" ")
 			.append(message.getMessage()).append(" ")
 			.append("\n");
 		final Throwable throwable = message.getThrowable();
@@ -104,7 +104,7 @@ private void output(Level level, FormattingTuple message) {
 	
 	@Override
 	public String getName() {
-		return "SnailLogger";
+		return this.name;
 	}
 	
 	/**
diff --git a/snail/src/main/java/com/acgist/snail/logger/LoggerConfig.java b/snail/src/main/java/com/acgist/snail/logger/LoggerConfig.java
@@ -46,14 +46,14 @@ private LoggerConfig() {
 	 * <p>配置信息</p>
 	 */
 	private final Properties properties;
-	/**
-	 * <p>日志名称</p>
-	 */
-	private String name;
 	/**
 	 * <p>日志级别</p>
 	 */
 	private String level;
+	/**
+	 * <p>日志系统名称</p>
+	 */
+	private String system;
 	/**
 	 * <p>日志适配</p>
 	 */
@@ -67,29 +67,20 @@ private LoggerConfig() {
 	 */
 	private int fileBuffer;
 	/**
-	 * <p>文件日志最大备份数量</p>
+	 * <p>文件日志最大备份时间</p>
 	 */
-	private int fileMaxSize;
+	private int fileMaxDays;
 	
 	/**
 	 * <p>初始化配置</p>
 	 */
 	private void init() {
-		this.name = this.properties.getProperty("logger.name");
 		this.level = this.properties.getProperty("logger.level");
+		this.system = this.properties.getProperty("logger.system");
 		this.adapter = this.properties.getProperty("logger.adapter");
 		this.fileName = this.properties.getProperty("logger.file.name");
 		this.fileBuffer = Integer.parseInt(this.properties.getProperty("logger.file.buffer", "8192"));
-		this.fileMaxSize = Integer.parseInt(this.properties.getProperty("logger.file.max.size", "30"));
-	}
-
-	/**
-	 * <p>获取日志名称</p>
-	 * 
-	 * @return 日志名称
-	 */
-	public static final String getName() {
-		return INSTANCE.name;
+		this.fileMaxDays = Integer.parseInt(this.properties.getProperty("logger.file.max.days", "30"));
 	}
 
 	/**
@@ -100,6 +91,15 @@ public static final String getName() {
 	public static final String getLevel() {
 		return INSTANCE.level;
 	}
+	
+	/**
+	 * <p>获取日志系统名称</p>
+	 * 
+	 * @return 日志系统名称
+	 */
+	public static final String getSystem() {
+		return INSTANCE.system;
+	}
 
 	/**
 	 * <p>获取日志级别（数字）</p>
@@ -146,12 +146,12 @@ public static final int getFileBuffer() {
 	}
 
 	/**
-	 * <p>获取文件日志最大备份数量</p>
+	 * <p>获取文件日志最大备份时间</p>
 	 * 
-	 * @return 文件日志最大备份数量
+	 * @return 文件日志最大备份时间
 	 */
-	public static final int getFileMaxSize() {
-		return INSTANCE.fileMaxSize;
+	public static final int getFileMaxDays() {
+		return INSTANCE.fileMaxDays;
 	}
 
 }
diff --git a/snail/src/main/java/com/acgist/snail/logger/adapter/FileLoggerAdapter.java b/snail/src/main/java/com/acgist/snail/logger/adapter/FileLoggerAdapter.java
@@ -6,6 +6,10 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 
 import com.acgist.snail.logger.Logger;
@@ -36,22 +40,84 @@ public FileLoggerAdapter() {
 	 * @return 文件输出流
 	 */
 	private OutputStream buildOutput() {
-		final String fileName = LoggerConfig.getFileName();
 		final int fileBuffer = LoggerConfig.getFileBuffer();
-		final SimpleDateFormat format = new SimpleDateFormat(".yyyy.MM.dd");
-		final String path = fileName + format.format(new Date());
+		final File file = this.buildFile();
+		this.buildParent(file);
 		try {
-			final File file = new File(path);
-			// 创建上级目录
-			final File parent = file.getParentFile();
-			if(!parent.exists()) {
-				parent.mkdirs();
-			}
 			return new BufferedOutputStream(new FileOutputStream(file, true), fileBuffer);
 		} catch (IOException e) {
 			Logger.error(e);
 		}
 		return null;
 	}
-
+	
+	@Override
+	public void release() {
+		super.release();
+		final File file = this.buildFile();
+		final String fileName = file.getName();
+		final LocalDateTime now = LocalDateTime.now();
+		final int maxDays = LoggerConfig.getFileMaxDays();
+		final File[] childrens = file.getParentFile().listFiles();
+		for (File children : childrens) {
+			if(this.deleteable(maxDays, fileName, now, children)) {
+				children.delete();
+			}
+		}
+	}
+	
+	/**
+	 * <p>创建日志文件</p>
+	 * 
+	 * @return 日志文件
+	 */
+	private File buildFile() {
+		final String fileName = LoggerConfig.getFileName();
+		final SimpleDateFormat format = new SimpleDateFormat(".yyyy.MM.dd");
+		final String path = fileName + format.format(new Date());
+		return new File(path);
+	}
+	
+	/**
+	 * <p>创建上级目录</p>
+	 * 
+	 * @param file 日志文件
+	 */
+	private void buildParent(File file) {
+		final File parent = file.getParentFile();
+		if(!parent.exists()) {
+			parent.mkdirs();
+		}
+	}
+	
+	/**
+	 * <p>判断文件是否能够删除</p>
+	 * <p>日志文件、超过最大备份数量</p>
+	 * 
+	 * @param maxDays 最大备份数量
+	 * @param fileName 日志文件名称
+	 * @param now 当前时间
+	 * @param file 文件
+	 * 
+	 * @return 是否可以删除
+	 */
+	private boolean deleteable(int maxDays, String fileName, LocalDateTime now, File file) {
+		// 判断修改时间
+		final LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(file.lastModified()), ZoneId.systemDefault());
+		final long days = Duration.between(localDateTime, now).toDays();
+		if(days <= maxDays) {
+			return false;
+		}
+		// 判断文件名称
+		final String name = file.getName();
+		if(name.length() != fileName.length()) {
+			return false;
+		}
+		// snail.log.yyyy.MM.dd
+		if(name.length() <= 10) {
+			return false;
+		}
+		return name.substring(0, 10).equals(fileName.substring(0, 10));
+	}
+	
 }
diff --git a/snail/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/snail/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -10,7 +10,7 @@
  * 
  * @author acgist
  */
-public class StaticLoggerBinder implements LoggerFactoryBinder {
+public final class StaticLoggerBinder implements LoggerFactoryBinder {
 
 	private static final StaticLoggerBinder INSTANCE = new StaticLoggerBinder();
 	
diff --git a/snail/src/main/resources/logger.properties b/snail/src/main/resources/logger.properties
@@ -1,13 +1,13 @@
 #================ 日志配置 ================#
-# 日志名称
-logger.name=Snail
 # 日志级别
 logger.level=DEBUG
+# 日志系统名称
+logger.system=Snail
 # 日志适配
 logger.adapter=file, console
 # 文件日志名称
 logger.file.name=logs/snail.log
 # 文件日志缓存
 logger.file.buffer=8192
-# 文件日志最大备份数量
-logger.file.max.size=30
+# 文件日志最大备份时间
+logger.file.max.days=30
diff --git a/snail/src/main/resources/profiles/release/logger.properties b/snail/src/main/resources/profiles/release/logger.properties
@@ -1,13 +1,13 @@
 #================ 日志配置 ================#
-# 日志名称
-logger.name=Snail
 # 日志级别
 logger.level=INFO
+# 日志系统名称
+logger.system=Snail
 # 日志适配
 logger.adapter=file
 # 文件日志名称
 logger.file.name=logs/snail.log
 # 文件日志缓存
 logger.file.buffer=8192
-# 文件日志最大备份数量
-logger.file.max.size=30
+# 文件日志最大备份时间
+logger.file.max.days=30

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @author acgist`
`12`	`12`	`*/`
`13`		`-public class StaticLoggerBinder implements LoggerFactoryBinder {`
	`13`	`+public final class StaticLoggerBinder implements LoggerFactoryBinder {`
`14`	`14`
`15`	`15`	`private static final StaticLoggerBinder INSTANCE = new StaticLoggerBinder();`
`16`	`16`