Skip to content

Commit 41ec3de

Browse files
committed
refactor: 🎨 improve debug message logging
1 parent c5e6b88 commit 41ec3de

File tree

3 files changed

+39
-15
lines changed

3 files changed

+39
-15
lines changed

src/main/java/net/netshot/netshot/rest/RestService.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5158,31 +5158,41 @@ else if ("PythonRule".equals(rsRule.getType())) {
51585158
@Override
51595159
@Export
51605160
public void warn(String message) {
5161-
log.append(String.format("[WARN] %s\n", message));
5161+
log.append("[WARN] ");
5162+
log.append(message);
5163+
log.append("\n");
51625164
}
51635165

51645166
@Override
51655167
@Export
51665168
public void trace(String message) {
5167-
log.append(String.format("[TRACE] %s\n", message));
5169+
log.append("[TRACE] ");
5170+
log.append(message);
5171+
log.append("\n");
51685172
}
51695173

51705174
@Override
51715175
@Export
51725176
public void info(String message) {
5173-
log.append(String.format("[INFO] %s\n", message));
5177+
log.append("[INFO] ");
5178+
log.append(message);
5179+
log.append("\n");
51745180
}
51755181

51765182
@Override
51775183
@Export
51785184
public void error(String message) {
5179-
log.append(String.format("[ERROR] %s\n", message));
5185+
log.append("[ERROR] ");
5186+
log.append(message);
5187+
log.append("\n");
51805188
}
51815189

51825190
@Override
51835191
@Export
51845192
public void debug(String message) {
5185-
log.append(String.format("[DEBUG] %s\n", message));
5193+
log.append("[DEBUG] ");
5194+
log.append(message);
5195+
log.append("\n");
51865196
}
51875197
};
51885198

src/main/java/net/netshot/netshot/work/Task.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -457,23 +457,33 @@ public boolean isRepeating() {
457457
}
458458

459459
public void debug(String message) {
460-
this.logs.append(String.format("[DEBUG] %s\n", message));
460+
this.logs.append("[DEBUG] ");
461+
this.logs.append(message);
462+
this.logs.append("\n");
461463
}
462464

463465
public void trace(String message) {
464-
this.logs.append(String.format("[TRACE] %s\n", message));
466+
this.logs.append("[TRACE] ");
467+
this.logs.append(message);
468+
this.logs.append("\n");
465469
}
466470

467471
public void info(String message) {
468-
this.logs.append(String.format("[INFO] %s\n", message));
472+
this.logs.append("[INFO] ");
473+
this.logs.append(message);
474+
this.logs.append("\n");
469475
}
470476

471477
public void warn(String message) {
472-
this.logs.append(String.format("[WARN] %s\n", message));
478+
this.logs.append("[WARN] ");
479+
this.logs.append(message);
480+
this.logs.append("\n");
473481
}
474482

475483
public void error(String message) {
476-
this.logs.append(String.format("[ERROR] %s\n", message));
484+
this.logs.append("[ERROR] ");
485+
this.logs.append(message);
486+
this.logs.append("\n");
477487
}
478488

479489

src/main/java/net/netshot/netshot/work/logger/StringListTaskLogger.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,38 @@ public StringListTaskLogger(List<String> logs) {
3535
this.logs = logs;
3636
}
3737

38+
private String sanitize(String message) {
39+
return message.replace("\0", "");
40+
}
41+
3842
@Export
3943
@Override
4044
public void warn(String message) {
41-
this.logs.add(String.format("[WARN] %s", message));
45+
this.logs.add("[WARN] " + sanitize(message));
4246
}
4347

4448
@Export
4549
@Override
4650
public void trace(String message) {
47-
this.logs.add(String.format("[TRACE] %s", message));
51+
this.logs.add("[TRACE] " + sanitize(message));
4852
}
4953

5054
@Export
5155
@Override
5256
public void info(String message) {
53-
this.logs.add(String.format("[INFO] %s", message));
57+
this.logs.add("[INFO] " + sanitize(message));
5458
}
5559

5660
@Export
5761
@Override
5862
public void error(String message) {
59-
this.logs.add(String.format("[ERROR] %s", message));
63+
this.logs.add("[ERROR] " + sanitize(message));
6064
}
6165

6266
@Export
6367
@Override
6468
public void debug(String message) {
65-
this.logs.add(String.format("[DEBUG] %s", message));
69+
this.logs.add("[DEBUG] " + sanitize(message));
6670
}
6771

6872
}

0 commit comments

Comments
 (0)