Skip to content

Commit 18cae41

Browse files
committed
revert custom LogLevels impl, not worth to add complexity, keep original simpler design
Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
1 parent 5690d5f commit 18cae41

19 files changed

+23
-102
lines changed

CHANGELOG.md

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

33
### 9.3.1 (10/8/2025 - )
44

5-
* log: config output level via LogLevels.infoLevel()/traceLevel(), make it possible to reduce unnecessary external logs
65

76
### 9.3.0 (8/27/2025 - 10/8/2025) !!! only support java 25
87

core-ng/src/main/java/core/framework/internal/cache/LocalCacheStore.java

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

33
import core.framework.internal.log.filter.ArrayLogParam;
44
import core.framework.util.Maps;
5+
import org.jspecify.annotations.Nullable;
56
import org.slf4j.Logger;
67
import org.slf4j.LoggerFactory;
78

@@ -18,12 +19,14 @@ public class LocalCacheStore implements CacheStore {
1819
private final Logger logger = LoggerFactory.getLogger(LocalCacheStore.class);
1920
public int maxSize = 10000; // 10000 simple objects roughly takes 1M-10M heap + hashmap overhead
2021

22+
@Nullable
2123
@Override
2224
public <T> T get(String key, CacheContext<T> context) {
2325
logger.debug("get, key={}", key);
2426
return get(key, System.currentTimeMillis());
2527
}
2628

29+
@Nullable
2730
private <T> T get(String key, long now) {
2831
@SuppressWarnings("unchecked")
2932
CacheItem<T> item = (CacheItem<T>) caches.get(key);

core-ng/src/main/java/core/framework/internal/log/AbstractLogger.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package core.framework.internal.log;
22

3-
import core.framework.log.LogLevel;
43
import org.slf4j.Logger;
54
import org.slf4j.Marker;
65

core-ng/src/main/java/core/framework/internal/log/ActionLog.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package core.framework.internal.log;
22

3-
import core.framework.log.LogLevel;
43
import core.framework.log.Markers;
54
import core.framework.util.Strings;
65
import org.jspecify.annotations.Nullable;
@@ -13,8 +12,8 @@
1312
import java.util.List;
1413
import java.util.Map;
1514

16-
import static core.framework.log.LogLevel.DEBUG;
17-
import static core.framework.log.LogLevel.WARN;
15+
import static core.framework.internal.log.LogLevel.DEBUG;
16+
import static core.framework.internal.log.LogLevel.WARN;
1817

1918
/**
2019
* @author neo

core-ng/src/main/java/core/framework/internal/log/DefaultLoggerFactory.java

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package core.framework.internal.log;
22

3-
import core.framework.log.LogLevel;
4-
import core.framework.log.LogLevels;
53
import core.framework.util.Maps;
64
import org.slf4j.ILoggerFactory;
75
import org.slf4j.Logger;
@@ -13,13 +11,6 @@
1311
*/
1412
public final class DefaultLoggerFactory implements ILoggerFactory {
1513
private final Map<String, Logger> loggers = Maps.newConcurrentHashMap();
16-
private final LogLevels.Entry[] infoLevels;
17-
private final LogLevels.Entry[] traceLevels;
18-
19-
public DefaultLoggerFactory(LogLevels.Entry[] infoLevels, LogLevels.Entry[] traceLevels) {
20-
this.infoLevels = infoLevels;
21-
this.traceLevels = traceLevels;
22-
}
2314

2415
@Override
2516
public Logger getLogger(String name) {
@@ -31,19 +22,22 @@ private Logger createLogger(String name) {
3122
}
3223

3324
private LogLevel infoLevel(String name) {
34-
for (LogLevels.Entry entry : infoLevels) {
35-
if (name.startsWith(entry.prefix())) {
36-
return entry.level();
37-
}
25+
// kafka log info for every producer/consumer, to reduce verbosity
26+
if (name.startsWith("org.apache.kafka.")) {
27+
return LogLevel.WARN;
28+
}
29+
// refer to org.elasticsearch.nativeaccess.NativeAccessHolder, to emmit warning under integration-test env
30+
if (name.startsWith("org.elasticsearch.nativeaccess.")) {
31+
return LogLevel.ERROR;
3832
}
3933
return LogLevel.INFO;
4034
}
4135

4236
private LogLevel traceLevel(String name) {
43-
for (LogLevels.Entry entry : traceLevels) {
44-
if (name.startsWith(entry.prefix())) {
45-
return entry.level();
46-
}
37+
if (name.startsWith("org.elasticsearch.")
38+
|| name.startsWith("org.mongodb.")
39+
|| name.startsWith("org.xnio.")) {
40+
return LogLevel.INFO;
4741
}
4842
return LogLevel.DEBUG;
4943
}

core-ng/src/main/java/core/framework/internal/log/DefaultLoggerServiceProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package core.framework.internal.log;
22

3-
import core.framework.log.LogLevels;
43
import org.slf4j.ILoggerFactory;
54
import org.slf4j.IMarkerFactory;
65
import org.slf4j.helpers.BasicMarkerFactory;
@@ -38,7 +37,7 @@ public String getRequestedApiVersion() {
3837

3938
@Override
4039
public void initialize() {
41-
loggerFactory = LogLevels.createLoggerFactory();
40+
loggerFactory = new DefaultLoggerFactory();
4241
markerFactory = new BasicMarkerFactory();
4342
mdcAdapter = new NOPMDCAdapter();
4443
}

core-ng/src/main/java/core/framework/internal/log/LogEvent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package core.framework.internal.log;
22

33
import core.framework.internal.log.marker.ErrorCodeMarker;
4-
import core.framework.log.LogLevel;
54
import core.framework.util.Exceptions;
65
import core.framework.util.Network;
76
import org.jspecify.annotations.Nullable;

core-ng/src/main/java/core/framework/log/LogLevel.java renamed to core-ng/src/main/java/core/framework/internal/log/LogLevel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package core.framework.log;
1+
package core.framework.internal.log;
22

33
/**
44
* @author neo

core-ng/src/main/java/core/framework/internal/log/LoggerImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package core.framework.internal.log;
22

3-
import core.framework.log.LogLevel;
43
import core.framework.util.Strings;
54
import org.slf4j.Marker;
65

core-ng/src/main/java/core/framework/log/LogLevels.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)