Skip to content

Commit fde1f37

Browse files
OptiJavaOptiJava
committed
2022.6-Client(revert web app config,add Tomcat runner)
1 parent fb8bb83 commit fde1f37

File tree

21 files changed

+58
-42
lines changed

21 files changed

+58
-42
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

300 Bytes
Binary file not shown.

‎.gradle/7.4/fileHashes/fileHashes.lock

0 Bytes
Binary file not shown.

‎.gradle/7.4/fileHashes/resourceHashesCache.bin

238 Bytes
Binary file not shown.

‎.gradle/buildOutputCleanup/buildOutputCleanup.lock

0 Bytes
Binary file not shown.

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

-71 Bytes
Binary file not shown.

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

130 Bytes
Binary file not shown.

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

-179 Bytes
Binary file not shown.

‎build/resources/test/Settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"printWarn": true,
55
"printDebug": true,
66
"printFatal": true,
7-
"defaultConsolePath": "D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs",
7+
"defaultConsolePath": "D:\\Program\\Project\\resources\\app\\Git\\Projects\\Optilog-Client\\src\\test\\resources\\logs",
88
"consoleInfo": true,
99
"consoleDebug": true,
1010
"consoleError": true,

‎build/resources/test/Settings.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ printError=true
33
printWarn=true
44
printDebug=true
55
printFatal=true
6-
defaultConsolePath=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs
6+
defaultConsolePath=D:\\Program\\Project\\resources\\app\\Git\\Projects\\Optilog-Client\\src\\test\\resources\\logs
77
#Path1=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources
88
#debugPath=%path1
99
consoleInfo=true

‎build/resources/test/Settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<fatalSendToServer>true</fatalSendToServer>
1818
<startClient>true</startClient>
1919
<defaultConsolePath>
20-
D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs
20+
D:\\Program\\Project\\resources\\app\\Git\\Projects\\Optilog-Client\\src\\test\\resources\\logs
2121
</defaultConsolePath>
2222
<fileName>%timeLog(Client).log</fileName>
2323
<host>localhost</host>

‎build/resources/test/logs/2022-06-03 19-36-40Log.log

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[2022-06-03|19:36:40(54))][com.optilog.OptilogTest main(OptilogTest.java:10)/main] info:---常规输出测试---
2+
[2022-06-03|19:36:40(56))][com.optilog.OptilogTest main(OptilogTest.java:11)/main] info:infojava.lang.Object@50b494a6
3+
[2022-06-03|19:36:40(56))][com.optilog.OptilogTest main(OptilogTest.java:12)/main] Error:error
4+
[2022-06-03|19:36:40(56))][com.optilog.OptilogTest main(OptilogTest.java:13)/main] debug:debug32.0
5+
[2022-06-03|19:36:40(57))][com.optilog.OptilogTest main(OptilogTest.java:14)/main] FATAL:null
6+
[2022-06-03|19:36:40(57))][com.optilog.OptilogTest main(OptilogTest.java:15)/main] FATAL:null
7+
[2022-06-03|19:36:40(57))][com.optilog.OptilogTest main(OptilogTest.java:16)/main] Warning:warnnull
8+
[2022-06-03|19:36:40(58))][com.optilog.OptilogTest main(OptilogTest.java:17)/main] info:---占位符---
9+
[2022-06-03|19:36:40(58))][com.optilog.OptilogTest main(OptilogTest.java:18)/main] info:1 2
10+
[2022-06-03|19:36:40(58))][com.optilog.OptilogTest main(OptilogTest.java:19)/main] Error:1 1
11+
[2022-06-03|19:36:40(58))][com.optilog.OptilogTest main(OptilogTest.java:20)/main] Warning:null
12+
[2022-06-03|19:36:40(59))][com.optilog.OptilogTest main(OptilogTest.java:21)/main] debug:1 2 #3
13+
[2022-06-03|19:36:40(59))][com.optilog.OptilogTest main(OptilogTest.java:22)/main] FATAL:1 #2
14+
[2022-06-03|19:36:40(59))][com.optilog.OptilogTest main(OptilogTest.java:23)/main] debug:de
15+
[2022-06-03|19:36:40(60))][com.optilog.OptilogTest main(OptilogTest.java:24)/main] test:t!e!s!t！
16+
[2022-06-03|19:36:40(60))][com.optilog.OptilogTest test(OptilogTest.java:31)/main] Warning:---变化栈测试---
17+
[2022-06-03|19:36:40(60))][com.optilog.OptilogTest test(OptilogTest.java:32)/main] info:info(test)
18+
[2022-06-03|19:36:40(60))][com.optilog.OptilogTest test(OptilogTest.java:34)/main] info:$
19+
[2022-06-03|19:36:40(60))][com.optilog.OptilogTest lambda$test$1(OptilogTest.java:33)/Thread-17] info:hello
20+
[2022-06-03|19:36:40(62))][com.optilog.log.console.ZipLog zipAllLog(ZipLog.java:22)/main] Warning:Optilog Note: Failed to create log package zip.

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

-6 Bytes
Binary file not shown.

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

-1 Bytes
Binary file not shown.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.optilog.util.OnlyInInit;
77
import com.optilog.util.Util;
88
import com.optilog.util.exception.OptilogException;
9-
import com.optilog.util.web_tools.Tomcat;
109

1110
import java.io.IOException;
1211

@@ -26,7 +25,6 @@ public static void initLog(String settingFilePath, Optilog instance) {
2625
if (instance.consoleFileMasterCaution) {
2726
Console.initAppender(instance);
2827
Client.initAppender(instance);
29-
Tomcat.startTomcat(instance);
3028
}
3129
} catch (RuntimeException | IOException e) {
3230
Util.getOutput().println("Optilog Note:An Exception was thrown when Optilog init logger");

‎src/test/java/com/optilog/OptilogTest.java

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@
55
import com.optilog.log.Log;
66

77
public class OptilogTest {
8-
public static void main(String[] args) {
9-
Log log = Log.initLog("%prop -cp /Settings.properties");
10-
log.info("---常规输出测试---");
11-
log.info("info" + new Object());
12-
log.error("error");
13-
log.debug("debug" + 32f);
14-
log.fatal((char[]) null);
15-
log.fatal((String) null);
16-
log.warn("warn" + null);
17-
log.info("---占位符---");
18-
log.info("#1 #2", "1", "2");
19-
log.error("#1 #1", "1", "2");
20-
log.warn(null, "(Object) null");
21-
log.debug("#1 #2 #3", "1", "2");
22-
log.fatal("#1 ##2", "1", "2");
23-
log.debug("#1", () -> "de");
24-
log.log("t!e!s!t！", new LevelBuild("test", Level.INFO));
25-
test(log);
26-
//打包日志
27-
//log.command("%zip D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs");
28-
}
29-
30-
private static void test(Log log) {
31-
log.warn("---变化栈测试---");
32-
log.info("info(test)");
33-
new Thread(() -> log.info("hello")).start();
34-
log.info("$");
35-
//重新获得实例
36-
Log log2 = Log.initLog("");
37-
log2.info("log2");
38-
}
8+
public static void main(String[] args) {
9+
Log log = Log.initLog("%prop -cp /Settings.properties");
10+
log.info("---常规输出测试---");
11+
log.info("info" + new Object());
12+
log.error("error");
13+
log.debug("debug" + 32f);
14+
log.fatal((char[]) null);
15+
log.fatal((String) null);
16+
log.warn("warn" + null);
17+
log.info("---占位符---");
18+
log.info("#1 #2", "1", "2");
19+
log.error("#1 #1", "1", "2");
20+
log.warn(null, "(Object) null");
21+
log.debug("#1 #2 #3", "1", "2");
22+
log.fatal("#1 ##2", "1", "2");
23+
log.debug("#1", () -> "de");
24+
log.log("t!e!s!t！", new LevelBuild("test", Level.INFO));
25+
test(log);
26+
//打包日志
27+
log.command("%zip -d D:\\Program\\Project\\resources\\app\\Git\\Projects\\Optilog-Client\\src\\test\\resources\\logs");
28+
}
29+
30+
private static void test(Log log) {
31+
log.warn("---变化栈测试---");
32+
log.info("info(test)");
33+
new Thread(() -> log.info("hello")).start();
34+
log.info("$");
35+
//重新获得实例
36+
Log log2 = Log.initLog("");
37+
log2.info("log2");
38+
}
3939
}

‎src/test/java/com/optilog/Test.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.optilog;
22

3-
import com.optilog.log.Log;
4-
53
public class Test {
64
public static void main(String[] args) {
7-
Log log = Log.initLog("%prop -cp /Settings.properties");
5+
86
}
97
}
108

‎src/test/resources/Settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"printWarn": true,
55
"printDebug": true,
66
"printFatal": true,
7-
"defaultConsolePath": "D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs",
7+
"defaultConsolePath": "D:\\Program\\Project\\resources\\app\\Git\\Projects\\Optilog-Client\\src\\test\\resources\\logs",
88
"consoleInfo": true,
99
"consoleDebug": true,
1010
"consoleError": true,

‎src/test/resources/Settings.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ printError=true
33
printWarn=true
44
printDebug=true
55
printFatal=true
6-
defaultConsolePath=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs
6+
defaultConsolePath=D:\\Program\\Project\\resources\\app\\Git\\Projects\\Optilog-Client\\src\\test\\resources\\logs
77
#Path1=D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources
88
#debugPath=%path1
99
consoleInfo=true

‎src/test/resources/Settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<fatalSendToServer>true</fatalSendToServer>
1818
<startClient>true</startClient>
1919
<defaultConsolePath>
20-
D:\\Program\\Feishu\\app\\assets\\object\\apps\\Intellij-IDEA\\Project\\Optilog-Client\\src\\test\\resources\\logs
20+
D:\\Program\\Project\\resources\\app\\Git\\Projects\\Optilog-Client\\src\\test\\resources\\logs
2121
</defaultConsolePath>
2222
<fileName>%timeLog(Client).log</fileName>
2323
<host>localhost</host>

0 commit comments

Comments
 (0)