2022.6-Client(performance)

Author: OptiJava

.gradle/7.4/executionHistory/executionHistory.bin

@@ -1,4 +1,5 @@
 # Optilog
+
 ![Build](https://img.shields.io/badge/Build-Passing-green)
 [![Latest-Release](https://img.shields.io/badge/Release-Latest-blue)](https://github.com/OptiJava/Optilog-Client/releases/latest)
 [![Languege](https://img.shields.io/badge/Language-ChinesePage-red)](https://github.com/OptiJava/Optilog-Client/blob/master/README.md)
@@ -22,8 +23,9 @@ will be a bug! (see wiki for details)(expect when you need change setting file)
 
 # Optilog advantages
 
-1.High performance: Initialization log + output a log (output to the screen + output to a file + output to the server
-through socket) only takes 130 milliseconds at most (it will be optimized later), and log4j takes at least 300
+1.High performance: After initialization log, output a log (output to the screen + output to a file + output to the
+server
+through socket) only takes 8 milliseconds at most (it will be optimized later), and log4j takes at least 41
 milliseconds.
 
 2.Optilog supports unlimited placeholders and can be reused (#1 #1 outputs the first placeholder twice). Log4j only

.gradle/7.4/executionHistory/executionHistory.lock

@@ -1,4 +1,5 @@
 # [Optilog-Client](https://github.com/OptiJava/Optilog-Client/)
+
 ![Build](https://img.shields.io/badge/Build-Passing-green)
 [![Latest-Release](https://img.shields.io/badge/Release-Latest-blue)](https://github.com/OptiJava/Optilog-Client/releases/latest)
 [![Languege](https://img.shields.io/badge/Language-EnglishPage-red)](https://github.com/OptiJava/Optilog-Client/blob/master/README-en.md)
@@ -21,7 +22,7 @@ _如果你愿意，欢迎Fork这个仓库为Optilog做出贡献，本项目的
 
 # Optilog的优势
 
-1.性能高:初始化日志+输出一条日志（输出到屏幕+输出到文件+通过socket输出到服务端） 最快只需要130毫秒（后续还会再优化），log4j至少300毫秒
+1.性能高:在初始化后，再输出一条日志（输出到屏幕+输出到文件+通过socket输出到服务端） 最快只需要8毫秒（后续还会再优化），log4j至少41毫秒
 
 2.占位符方便：Optilog支持无限个占位符，并且可以重复使用（#1 #1输出两次第一个占位符），log4j只支持9个占位符
 
@@ -58,7 +59,8 @@ _如果你愿意，欢迎Fork这个仓库为Optilog做出贡献，本项目的
 
 # Dependency:
 
-`Gson-2.9.0` `jackson-dataformat-xml-2.13.3` `tomcat-embed-core-9.0.26` `tomcat-embed-jasper:9.0.26`(Tomcat依赖如果你不用的话可以没有，如果你只用properties作为配置文件的话Gson和Jackson也可以不加)
+`Gson-2.9.0` `jackson-dataformat-xml-2.13.3` `tomcat-embed-core-9.0.26` `tomcat-embed-jasper:9.0.26`(
+Tomcat依赖如果你不用的话可以没有，如果你只用properties作为配置文件的话Gson和Jackson也可以不加)
 
 # Author:
 

.gradle/7.4/fileHashes/fileHashes.bin

@@ -0,0 +1,28 @@
+printInfo=true
+printError=true
+printWarn=true
+printDebug=true
+printFatal=true
+defaultConsolePath=
+#Path1=
+#Path2=
+#infoPath=%path1
+#errorPath=%path2
+#warnPath=%path1
+#debugPath=%path1
+#fatalPath=%path2
+consoleInfo=false
+consoleDebug=false
+consoleError=false
+consoleWarn=false
+consoleFatal=false
+infoSendToServer=false
+errorSendToServer=false
+warnSendToServer=false
+debugSendToServer=false
+fatalSendToServer=false
+startClient=false
+socketNumber=65535
+packingFormat=[%yyyy-%MM-%dd|%HH:%mm:%ss(%SS))][%class %method(%file:%line)/%thread] %level:%msg
+fileName=%timeLog.log
+host=localhost

.gradle/7.4/fileHashes/fileHashes.lock

@@ -0,0 +1,2 @@
+[2022-06-04|15:06:57(20))][com.optilog.PerformanceTester main(PerformanceTester.java:8)/main] info: 
+[2022-06-04|15:06:57(23))][com.optilog.PerformanceTester main(PerformanceTester.java:11)/main] info:

.gradle/7.4/fileHashes/resourceHashesCache.bin

@@ -4,11 +4,15 @@
 
 public interface Log {
 	static Optilog initLog(String pathOfSettingFile) {
-		return new Optilog(pathOfSettingFile);
+		Optilog optilog = new Optilog(pathOfSettingFile);
+		LogInit.initLog(pathOfSettingFile, optilog);
+		return optilog;
 	}
 
 	static Optilog reInitLog(String pathOfSettingFile) {
-		return new Optilog(pathOfSettingFile);
+		Optilog optilog = new Optilog(pathOfSettingFile);
+		LogInit.initLog(pathOfSettingFile, optilog);
+		return optilog;
 	}
 
 	void info();

.gradle/buildOutputCleanup/buildOutputCleanup.lock

@@ -16,8 +16,8 @@ private LogInit() {
 	public static void initLog(String settingFilePath, Optilog instance) {
 		if (settingFilePath.isBlank()) {
 			instance.consoleFileMasterCaution = false;
-			instance.allSetting = new SettingFiles();
 		}
+		instance.allSetting = new SettingFiles();
 
 		try {
 			SettingFiles.check(settingFilePath, instance);

.gradle/file-system.probe

@@ -13,11 +13,6 @@ private Logger() {
 
 	@OnlyInLog
 	void logInfo(LogEvent le, Optilog instance) {
-		if (!instance.alreadyInit) {
-			LogInit.initLog(instance.settingFilePath, instance);
-			instance.alreadyInit = true;
-		}
-		
 		if (instance.allSetting.printInfo) {
 			Send.INSTANCE.loggerPrint(le, instance);
 		}
@@ -26,17 +21,13 @@ void logInfo(LogEvent le, Optilog instance) {
 			Send.INSTANCE.loggerConsole(le, instance);
 		}
 
-		if (instance.allSetting.serverInfo & instance.allSetting.startClient) {
+		if (instance.consoleFileMasterCaution & instance.allSetting.serverInfo & instance.allSetting.startClient) {
 			Send.INSTANCE.loggerToServer(le, instance);
 		}
 	}
 
 	@OnlyInLog
 	void logError(LogEvent le, Optilog instance) {
-		if (!instance.alreadyInit) {
-			LogInit.initLog(instance.settingFilePath, instance);
-			instance.alreadyInit = true;
-		}
 		if (instance.allSetting.printError) {
 			Send.INSTANCE.loggerPrint(le, instance);
 		}
@@ -45,17 +36,13 @@ void logError(LogEvent le, Optilog instance) {
 			Send.INSTANCE.loggerConsole(le, instance);
 		}
 
-		if (instance.allSetting.serverError & instance.allSetting.startClient) {
+		if (instance.consoleFileMasterCaution & instance.allSetting.serverError & instance.allSetting.startClient) {
 			Send.INSTANCE.loggerToServer(le, instance);
 		}
 	}
 
 	@OnlyInLog
 	void logWarn(LogEvent le, Optilog instance) {
-		if (!instance.alreadyInit) {
-			LogInit.initLog(instance.settingFilePath, instance);
-			instance.alreadyInit = true;
-		}
 		if (instance.allSetting.printWarn) {
 			Send.INSTANCE.loggerPrint(le, instance);
 		}
@@ -64,17 +51,13 @@ void logWarn(LogEvent le, Optilog instance) {
 			Send.INSTANCE.loggerConsole(le, instance);
 		}
 
-		if (instance.allSetting.serverWarn & instance.allSetting.startClient) {
+		if (instance.consoleFileMasterCaution & instance.allSetting.serverWarn & instance.allSetting.startClient) {
 			Send.INSTANCE.loggerToServer(le, instance);
 		}
 	}
 
 	@OnlyInLog
 	void logDebug(LogEvent le, Optilog instance) {
-		if (!instance.alreadyInit) {
-			LogInit.initLog(instance.settingFilePath, instance);
-			instance.alreadyInit = true;
-		}
 		if (instance.allSetting.printDebug) {
 			Send.INSTANCE.loggerPrint(le, instance);
 		}
@@ -83,17 +66,13 @@ void logDebug(LogEvent le, Optilog instance) {
 			Send.INSTANCE.loggerConsole(le, instance);
 		}
 
-		if (instance.allSetting.serverDebug & instance.allSetting.startClient) {
+		if (instance.consoleFileMasterCaution & instance.allSetting.serverDebug & instance.allSetting.startClient) {
 			Send.INSTANCE.loggerToServer(le, instance);
 		}
 	}
 
 	@OnlyInLog
 	void logFatal(LogEvent le, Optilog instance) {
-		if (!instance.alreadyInit) {
-			LogInit.initLog(instance.settingFilePath, instance);
-			instance.alreadyInit = true;
-		}
 		if (instance.allSetting.printFatal) {
 			Send.INSTANCE.loggerPrint(le, instance);
 		}
@@ -102,7 +81,7 @@ void logFatal(LogEvent le, Optilog instance) {
 			Send.INSTANCE.loggerConsole(le, instance);
 		}
 
-		if (instance.allSetting.serverFatal & instance.allSetting.startClient) {
+		if (instance.consoleFileMasterCaution & instance.allSetting.serverFatal & instance.allSetting.startClient) {
 			Send.INSTANCE.loggerToServer(le, instance);
 		}
 	}

README-en.md

@@ -12,7 +12,6 @@
 public class Optilog implements Log {
 	public volatile DatagramSocket socket;
 	public volatile boolean consoleFileMasterCaution = true;
-	public volatile boolean alreadyInit;
 
 	public volatile SettingFiles allSetting;
 
@@ -27,7 +26,6 @@ public class Optilog implements Log {
 	@OnlyInInit
 	Optilog(String var1) {
 		this.settingFilePath = var1;
-		this.alreadyInit = false;
 	}
 
 	@Override

README.md

@@ -13,16 +13,11 @@ public class Console {
 	@OnlyInInit
 	public static void initAppender(Optilog instance) {
 		if (instance.consoleFileMasterCaution) {
-			if (instance.allSetting != null) {
-				instance.allSetting.fileName = instance.allSetting.fileName.replace("%time", Matcher.quoteReplacement(DateTimeFormatter.ofPattern("yyyy-MM-dd HH-mm-ss").format(LocalDateTime.now())));
-			} else {
-				instance.consoleFileMasterCaution = false;
-				return;
-			}
+			instance.allSetting.fileName = instance.allSetting.fileName.replace("%time", Matcher.quoteReplacement(DateTimeFormatter.ofPattern("yyyy-MM-dd HH-mm-ss").format(LocalDateTime.now())));
 
 			if (!instance.allSetting.defaultConsolePath.equals("") & instance.consoleFileMasterCaution) {
 				final File f = new File(instance.allSetting.defaultConsolePath);
-				if (Console.checkFile(f, instance) & instance.consoleFileMasterCaution) {
+				if (Console.checkFile(f, instance)) {
 					File defFile = new File(instance.allSetting.defaultConsolePath + "//" + instance.allSetting.fileName);
 					try {
 						if (!defFile.isFile()) {

build/classes/java/main/com/optilog/log/Log.class

@@ -13,7 +13,6 @@ static void properties(InputStream content, Optilog instance) {
 		final Properties p = new Properties();
 		try {
 			p.load(content);
-			instance.allSetting = new SettingFiles();
 
 			instance.allSetting.printInfo = Boolean.parseBoolean(p.getProperty("printInfo", "true"));
 			instance.allSetting.printError = Boolean.parseBoolean(p.getProperty("printError", "true"));

build/classes/java/main/com/optilog/log/LogInit.class

@@ -4,7 +4,6 @@
 import com.optilog.log.Optilog;
 import com.optilog.util.OnlyInInit;
 import com.optilog.util.exception.ConfigureException;
-import com.optilog.util.exception.GsonNotFoundException;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -53,24 +52,6 @@ public class SettingFiles {
 
 	@OnlyInInit
 	public static void check(String str, Optilog instance) throws IOException {
-		try {
-			Class.forName("com.google.gson.Gson");
-		} catch (ClassNotFoundException e) {
-			if (!str.isBlank()) {
-				System.err.println("Can't find Gson in classpath");
-				instance.consoleFileMasterCaution = false;
-				throw new GsonNotFoundException("Can't found Gson in classpath", new ClassNotFoundException("Class:com.google.gson.Gson not found"));
-			}
-		}
-		try {
-			Class.forName("com.fasterxml.jackson.dataformat.xml.JacksonXmlModule");
-		} catch (ClassNotFoundException e) {
-			if (!str.isBlank()) {
-				System.err.println("Can't find jackson in classpath");
-				instance.consoleFileMasterCaution = false;
-				throw new GsonNotFoundException("Can't found jackson in classpath", new ClassNotFoundException("Class:com.fasterxml.jackson.dataformat.xml.JacksonXmlModule not found"));
-			}
-		}
 		if (!str.isBlank()) {
 			if (str.startsWith("%xml -cp ")) {
 				XmlSettings.xml(str.substring(9), true, instance);
@@ -125,10 +106,6 @@ private static void getSetting(String s, Optilog instance, boolean isClasspath)
 			System.exit(1);
 		}
 
-		if (instance.allSetting == null) {
-			instance.allSetting = new SettingFiles();
-		}
-		
 		if (object.defaultConsolePath != null) {
 			instance.allSetting.defaultConsolePath = object.defaultConsolePath;
 		}

build/classes/java/main/com/optilog/log/Logger.class

@@ -21,10 +21,6 @@ static void xml(String path, boolean isClasspath, Optilog instance) {
 				}
 				Settings object = new XmlMapper(new JacksonXmlModule()).readValue(input, Settings.class);
 
-				if (instance.allSetting == null) {
-					instance.allSetting = new SettingFiles();
-				}
-				
 				if (object.defaultConsolePath != null) {
 					instance.allSetting.defaultConsolePath = object.defaultConsolePath.trim();
 				}

build/classes/java/main/com/optilog/log/Optilog.class

@@ -1,7 +1,7 @@
 package com.optilog;
 
 public class JavaTest {
-    public static void main(String[] args) {
-    
-    }
+	public static void main(String[] args) {
+	
+	}
 }

build/classes/java/main/com/optilog/log/Send.class

@@ -3,10 +3,12 @@
 import com.optilog.log.Log;
 
 public class PerformanceTester {
-    public static void main(String[] args) {
-        long l = System.currentTimeMillis();
-        Log log = Log.initLog("%prop -cp /Settings.properties");
-        log.info("");
-        System.out.println(System.currentTimeMillis() - l);
-    }
+	public static void main(String[] args) {
+		long l = System.currentTimeMillis();
+		Log log = Log.initLog("%prop -cp /MinSetting.properties");
+		log.info();
+		
+		
+		System.out.println(System.currentTimeMillis() - l);
+	}
 }

build/classes/java/main/com/optilog/log/console/Console.class

@@ -0,0 +1,28 @@
+printInfo=true
+printError=true
+printWarn=true
+printDebug=true
+printFatal=true
+defaultConsolePath=
+#Path1=
+#Path2=
+#infoPath=%path1
+#errorPath=%path2
+#warnPath=%path1
+#debugPath=%path1
+#fatalPath=%path2
+consoleInfo=false
+consoleDebug=false
+consoleError=false
+consoleWarn=false
+consoleFatal=false
+infoSendToServer=false
+errorSendToServer=false
+warnSendToServer=false
+debugSendToServer=false
+fatalSendToServer=false
+startClient=false
+socketNumber=65535
+packingFormat=[%yyyy-%MM-%dd|%HH:%mm:%ss(%SS))][%class %method(%file:%line)/%thread] %level:%msg
+fileName=%timeLog.log
+host=localhost

build/classes/java/main/com/optilog/setting/PropSettings.class

@@ -0,0 +1,2 @@
+[2022-06-04|15:06:57(20))][com.optilog.PerformanceTester main(PerformanceTester.java:8)/main] info: 
+[2022-06-04|15:06:57(23))][com.optilog.PerformanceTester main(PerformanceTester.java:11)/main] info: