Skip to content

Commit a840c96

Browse files
OptiJavaOptiJava
committed
2022.6-Client(fix report system)
1 parent fde1f37 commit a840c96

File tree

16 files changed

+350
-304
lines changed

16 files changed

+350
-304
lines changed

‎build/resources/test/logs/2022-06-03 19-37-16(43)LogPackage.zip

1.12 KB
Binary file not shown.

‎build/resources/test/logs/2022-06-03 19-37-16Log.log

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

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
package com.optilog.log;
22

3+
import com.optilog.util.OnlyInLog;
4+
35
public class Level {
4-
/* */
5-
public final static Level INFO = new Level("info");
6-
public final static Level ERROR = new Level("Error");
7-
public final static Level WARN = new Level("Warning");
8-
public final static Level DEBUG = new Level("debug");
9-
public final static Level FATAL = new Level("FATAL");
10-
11-
Level(String name) {
12-
this.name = name;
13-
}
14-
15-
public String getName() {
16-
return this.name;
17-
}
18-
19-
private final String name;
6+
/* */
7+
public final static Level INFO = new Level("info");
8+
public final static Level ERROR = new Level("Error");
9+
public final static Level WARN = new Level("Warning");
10+
public final static Level DEBUG = new Level("debug");
11+
public final static Level FATAL = new Level("FATAL");
12+
13+
@OnlyInLog
14+
Level(String name) {
15+
this.name = name;
16+
}
17+
18+
public String getName() {
19+
return this.name;
20+
}
21+
22+
private final String name;
2023
}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package com.optilog.log;
22

3+
import com.optilog.util.OnlyInLog;
4+
35
public class LevelBuild {
4-
volatile String levelName;
5-
6-
volatile Level levelTemplate;
7-
8-
public LevelBuild(String levelName, Level levelTemplate) {
9-
this.levelName = levelName;
10-
this.levelTemplate = levelTemplate;
11-
}
6+
volatile String levelName;
7+
8+
volatile Level levelTemplate;
9+
10+
@OnlyInLog
11+
public LevelBuild(String levelName, Level levelTemplate) {
12+
this.levelName = levelName;
13+
this.levelTemplate = levelTemplate;
14+
}
1215
}

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

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

3+
import com.optilog.util.OnlyInLog;
4+
35
public class LogEvent {
46
volatile String message;
57

@@ -12,6 +14,7 @@ public String toString() {
1214
return this.level + " " + this.message;
1315
}
1416

17+
@OnlyInLog
1518
public LogEvent(String msg, Level level) {
1619
this.level = level;
1720
this.message = msg;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.optilog.setting.SettingFiles;
44
import com.optilog.util.LambdaExecute;
5+
import com.optilog.util.OnlyInInit;
56

67
import java.lang.reflect.Field;
78
import java.net.DatagramSocket;
@@ -23,6 +24,7 @@ public class Optilog implements Log {
2324
public volatile String debug = "";
2425
public volatile String fatal = "";
2526

27+
@OnlyInInit
2628
Optilog(String var1) {
2729
this.settingFilePath = var1;
2830
this.alreadyInit = false;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ void loggerConsole(LogEvent le, Optilog instance) {
4040
return;
4141
}
4242
if (instance.consoleFileMasterCaution & Level.ERROR.getName().equals(le.level.getName()) & !instance.error.isBlank()) {
43-
//String s = Packing.packMessage(message, level, instance);
4443
try {
4544
synchronized (Send.INSTANCE) {
4645
Files.writeString(Path.of(instance.error), Files.readString(Path.of(instance.error), StandardCharsets.UTF_8) + s, StandardCharsets.UTF_8);

‎src/main/java/com/optilog/log/client/Client.java

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,34 @@
88
import java.net.*;
99

1010
public class Client {
11-
@OnlyInInit
12-
public static void initAppender(Optilog instance) {
13-
if (instance.consoleFileMasterCaution & instance.allSetting.startClient) {
14-
try {
15-
instance.socket = new DatagramSocket();
16-
instance.socket.setSoTimeout(1000);
17-
instance.socket.connect(InetAddress.getByName(instance.allSetting.host), instance.allSetting.socketNumber);
18-
} catch (UnknownHostException | SocketException exception) {
19-
System.out.println("Optilog Note:Exception in init client.");
20-
exception.printStackTrace();
21-
}
22-
}
23-
}
24-
25-
@OnlyInLog
26-
public static void logAppender(String msg, Optilog instance) {
27-
try {
28-
if (instance.consoleFileMasterCaution) {
29-
instance.socket.send(new DatagramPacket(msg.getBytes(), msg.getBytes().length));
30-
}
31-
} catch (IOException e) {
32-
instance.error("Optilog Note:IOException in Client.", e);
33-
}
34-
}
35-
36-
@OnlyInLog
37-
public static void stop(Optilog instance) {
38-
instance.socket.disconnect();
39-
instance.info("Optilog Note:Socket Disconnected!");
40-
}
11+
@OnlyInInit
12+
public static void initAppender(Optilog instance) {
13+
if (instance.consoleFileMasterCaution & instance.allSetting.startClient) {
14+
try {
15+
instance.socket = new DatagramSocket();
16+
instance.socket.setSoTimeout(1000);
17+
instance.socket.connect(InetAddress.getByName(instance.allSetting.host), instance.allSetting.socketNumber);
18+
} catch (UnknownHostException | SocketException exception) {
19+
System.out.println("Optilog Note: Exception in init client.");
20+
exception.printStackTrace();
21+
}
22+
}
23+
}
24+
25+
@OnlyInLog
26+
public static void logAppender(String msg, Optilog instance) {
27+
try {
28+
if (instance.consoleFileMasterCaution) {
29+
instance.socket.send(new DatagramPacket(msg.getBytes(), msg.getBytes().length));
30+
}
31+
} catch (IOException e) {
32+
instance.error("Optilog Note:IOException in Client.", e);
33+
}
34+
}
35+
36+
@OnlyInLog
37+
public static void stop(Optilog instance) {
38+
instance.socket.disconnect();
39+
instance.info("Optilog Note:Socket Disconnected!");
40+
}
4141
}

0 commit comments

Comments
 (0)