Skip to content

Commit e813ecf

Browse files
OptiJavaOptiJava
committed
2022.6.2-Client(update OptilogAPI)
1 parent c1b823d commit e813ecf

31 files changed

+106
-8
lines changed

‎.gradle/7.4/executionHistory/executionHistory.bin

0 Bytes
Binary file not shown.

‎.gradle/7.4/executionHistory/executionHistory.lock

0 Bytes
Binary file not shown.

‎.gradle/7.4/fileHashes/fileHashes.bin

600 Bytes
Binary file not shown.

‎.gradle/7.4/fileHashes/fileHashes.lock

0 Bytes
Binary file not shown.

‎.gradle/7.4/fileHashes/resourceHashesCache.bin

884 Bytes
Binary file not shown.

‎.gradle/buildOutputCleanup/buildOutputCleanup.lock

0 Bytes
Binary file not shown.

‎.gradle/file-system.probe

0 Bytes
Binary file not shown.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[中文](https://github.com/OptiJava/Optilog-Client/blob/master/README.md) |
77
[English](https://github.com/OptiJava/Optilog-Client/blob/master/README-en.md)
88

9-
_截止目前，Optilog代码总量3262行！_
9+
_截止目前，Optilog代码总量3294行！_
1010

1111
这是一个用java语言编写的开源日志框架，他相比现在其他开源日志框架（比如log4j,slf4j）有更多的[优势](https://github.com/OptiJava/Optilog-Client#optilog%E7%9A%84%E4%BC%98%E5%8A%BF)
1212

‎build/classes/java/main/com/optilog/annotation/AnnotationProcessor.class

-251 Bytes
Binary file not shown.

‎build/classes/java/main/com/optilog/annotation/Call.class

-403 Bytes
Binary file not shown.

‎build/classes/java/main/com/optilog/log/IOptilog.class

113 Bytes
Binary file not shown.

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

136 Bytes
Binary file not shown.

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

14 Bytes
Binary file not shown.

‎build/classes/java/main/com/optilog/util/Util.class

40 Bytes
Binary file not shown.

‎build/classes/java/main/com/optilog/util/tools/Assert.class

1.41 KB
Binary file not shown.

‎build/classes/java/test/com/optilog/JavaTest.class

-75 Bytes
Binary file not shown.

‎build/classes/java/test/com/optilog/Optilog.class

754 Bytes
Binary file not shown.

‎build/classes/java/test/com/optilog/OptilogTest.class

-4 Bytes
Binary file not shown.

‎build/classes/java/test/com/optilog/PerformanceTester.class

-4 Bytes
Binary file not shown.

‎build/classes/java/test/com/optilog/Test.class

-155 Bytes
Binary file not shown.

‎build/resources/test/logs/2022-06-08 19-57-03Log.log

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/resources/test/logs/2022-06-10 17-29-04Log.log

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[2022-06-10|17:29:04(80))][com.optilog.OptilogTest main(OptilogTest.java:10)/main] info:---常规输出测试---
2+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:11)/main] info:infojava.lang.Object@6166e06f
3+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:12)/main] Error:error
4+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:13)/main] debug:debug32.0
5+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:14)/main] FATAL:null
6+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:15)/main] FATAL:null
7+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:16)/main] Warning:warnnull
8+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:17)/main] info:---占位符---
9+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:18)/main] info:1 2
10+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:19)/main] Error:1 1
11+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:20)/main] Warning:null
12+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:21)/main] debug:1 2 #3
13+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest main(OptilogTest.java:22)/main] FATAL:1 #2
14+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest main(OptilogTest.java:23)/main] debug:de
15+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest main(OptilogTest.java:24)/main] test:t!e!s!t！
16+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest test(OptilogTest.java:31)/main] Warning:---变化栈测试---
17+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest test(OptilogTest.java:32)/main] info:info(test)
18+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest test(OptilogTest.java:34)/main] info:$
19+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest lambda$test$1(OptilogTest.java:33)/Thread-17] info:hello
20+
[2022-06-10|17:29:04(88))][com.optilog.OptilogTest test(OptilogTest.java:39)/main] info:log2

‎build/resources/test/logs/2022-06-10 17-42-53Log.log

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[2022-06-10|17:42:53(54))][com.optilog.OptilogTest main(OptilogTest.java:10)/main] info:---常规输出测试---
2+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:11)/main] info:infojava.lang.Object@1c72da34
3+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:12)/main] Error:error
4+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:13)/main] debug:debug32.0
5+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:14)/main] FATAL:null
6+
[2022-06-10|17:42:53(57))][com.optilog.OptilogTest main(OptilogTest.java:15)/main] FATAL:null
7+
[2022-06-10|17:42:53(57))][com.optilog.OptilogTest main(OptilogTest.java:16)/main] Warning:warnnull
8+
[2022-06-10|17:42:53(57))][com.optilog.OptilogTest main(OptilogTest.java:17)/main] info:---占位符---
9+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:18)/main] info:1 2
10+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:19)/main] Error:1 1
11+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:20)/main] Warning:null
12+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:21)/main] debug:1 2 #3
13+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:22)/main] FATAL:1 #2
14+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:23)/main] debug:de
15+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:24)/main] test:t!e!s!t！
16+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:31)/main] Warning:---变化栈测试---
17+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:32)/main] info:info(test)
18+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:34)/main] info:$
19+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest lambda$test$1(OptilogTest.java:33)/Thread-17] info:hello
20+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:39)/main] info:log2

‎build/tmp/compileJava/previous-compilation-data.bin

86 Bytes
Binary file not shown.

‎build/tmp/compileTestJava/previous-compilation-data.bin

7 Bytes
Binary file not shown.

‎src/main/java/com/optilog/log/IOptilog.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.optilog.log;
2+
3+
public interface IOptilog {
4+
5+
}

‎src/main/java/com/optilog/log/Log.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,32 @@
22

33
import com.optilog.annotation.AnnotationProcessor;
44
import com.optilog.util.LambdaExecute;
5+
import com.optilog.util.Util;
56

6-
public interface Log {
7-
static Optilog initLog(String pathOfSettingFile) {
7+
public interface Log extends IOptilog {
8+
static Log initLog(String pathOfSettingFile) {
9+
if (Util.addon != null) {
10+
return Util.addon;
11+
}
812
Optilog optilog = new Optilog(pathOfSettingFile);
9-
Optilog.initLog(pathOfSettingFile, optilog);
13+
optilog.logPreparer(pathOfSettingFile, optilog);
1014
return optilog;
1115
}
1216

13-
static Optilog initLog(String pathOfSettingFile, boolean checkOptilogAnnotation) {
17+
static Log initLog(String pathOfSettingFile, boolean checkOptilogAnnotation) {
18+
if (Util.addon != null) {
19+
return Util.addon;
20+
}
1421
Optilog optilog = new Optilog(pathOfSettingFile);
15-
Optilog.initLog(pathOfSettingFile, optilog);
22+
optilog.logPreparer(pathOfSettingFile, optilog);
1623
if (checkOptilogAnnotation) {
1724
AnnotationProcessor.process();
1825
}
1926
return optilog;
2027
}
2128

29+
void logPreparer(String settingFilePath, Optilog instance);
30+
2231
void info();
2332

2433
void info(Object msg, Object... occupy);

‎src/main/java/com/optilog/log/Optilog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ public class Optilog implements Log {
3737
this.settingFilePath = s;
3838
}
3939

40+
@Override
4041
@OnlyInInit
41-
public static void initLog(String settingFilePath, Optilog instance) {
42+
public void logPreparer(String settingFilePath, Optilog instance) {
4243
if (settingFilePath.isBlank()) {
4344
instance.consoleFileMasterCaution = false;
4445
}

‎src/main/java/com/optilog/util/Util.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.optilog.util;
22

3+
import com.optilog.log.Log;
4+
35
import java.io.PrintStream;
46

57
public class Util {
@@ -8,4 +10,6 @@ public class Util {
810
public static PrintStream getOutput() {
911
return System.out;
1012
}
13+
14+
public static Log addon;
1115
}

‎src/test/resources/logs/2022-06-10 17-29-04Log.log

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[2022-06-10|17:29:04(80))][com.optilog.OptilogTest main(OptilogTest.java:10)/main] info:---常规输出测试---
2+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:11)/main] info:infojava.lang.Object@6166e06f
3+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:12)/main] Error:error
4+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:13)/main] debug:debug32.0
5+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:14)/main] FATAL:null
6+
[2022-06-10|17:29:04(83))][com.optilog.OptilogTest main(OptilogTest.java:15)/main] FATAL:null
7+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:16)/main] Warning:warnnull
8+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:17)/main] info:---占位符---
9+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:18)/main] info:1 2
10+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:19)/main] Error:1 1
11+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:20)/main] Warning:null
12+
[2022-06-10|17:29:04(85))][com.optilog.OptilogTest main(OptilogTest.java:21)/main] debug:1 2 #3
13+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest main(OptilogTest.java:22)/main] FATAL:1 #2
14+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest main(OptilogTest.java:23)/main] debug:de
15+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest main(OptilogTest.java:24)/main] test:t!e!s!t！
16+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest test(OptilogTest.java:31)/main] Warning:---变化栈测试---
17+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest test(OptilogTest.java:32)/main] info:info(test)
18+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest test(OptilogTest.java:34)/main] info:$
19+
[2022-06-10|17:29:04(87))][com.optilog.OptilogTest lambda$test$1(OptilogTest.java:33)/Thread-17] info:hello
20+
[2022-06-10|17:29:04(88))][com.optilog.OptilogTest test(OptilogTest.java:39)/main] info:log2

‎src/test/resources/logs/2022-06-10 17-42-53Log.log

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[2022-06-10|17:42:53(54))][com.optilog.OptilogTest main(OptilogTest.java:10)/main] info:---常规输出测试---
2+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:11)/main] info:infojava.lang.Object@1c72da34
3+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:12)/main] Error:error
4+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:13)/main] debug:debug32.0
5+
[2022-06-10|17:42:53(55))][com.optilog.OptilogTest main(OptilogTest.java:14)/main] FATAL:null
6+
[2022-06-10|17:42:53(57))][com.optilog.OptilogTest main(OptilogTest.java:15)/main] FATAL:null
7+
[2022-06-10|17:42:53(57))][com.optilog.OptilogTest main(OptilogTest.java:16)/main] Warning:warnnull
8+
[2022-06-10|17:42:53(57))][com.optilog.OptilogTest main(OptilogTest.java:17)/main] info:---占位符---
9+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:18)/main] info:1 2
10+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:19)/main] Error:1 1
11+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:20)/main] Warning:null
12+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:21)/main] debug:1 2 #3
13+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:22)/main] FATAL:1 #2
14+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:23)/main] debug:de
15+
[2022-06-10|17:42:53(59))][com.optilog.OptilogTest main(OptilogTest.java:24)/main] test:t!e!s!t！
16+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:31)/main] Warning:---变化栈测试---
17+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:32)/main] info:info(test)
18+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:34)/main] info:$
19+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest lambda$test$1(OptilogTest.java:33)/Thread-17] info:hello
20+
[2022-06-10|17:42:53(60))][com.optilog.OptilogTest test(OptilogTest.java:39)/main] info:log2

0 commit comments

Comments
 (0)