Skip to content

Avoid NPE when level is not set for stats logger. #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cezarfx merged 1 commit into from
May 5, 2023
Merged

Avoid NPE when level is not set for stats logger. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions driver/src/main/java/oracle/nosql/driver/http/Stats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,16 +434,18 @@ synchronized void clear() {
extraQueryStats = new ExtraQueryStats(statsControl);
}

// Setup the scheduler for interval logging
// Set up the scheduler for interval logging
Runnable runnable = () -> {
try {
logClientStats();
} catch (RuntimeException re) {
StringWriter stackTrace = new StringWriter();
re.printStackTrace(new PrintWriter(stackTrace));
statsControl.getLogger().log(Level.INFO,
"Stats exception: " + re.getMessage() + "\n" +
stackTrace);
if (statsControl.getLogger() != null) {
StringWriter stackTrace = new StringWriter();
re.printStackTrace(new PrintWriter(stackTrace));
statsControl.getLogger().log(Level.INFO,
"Stats exception: " + re.getMessage() + "\n" +
stackTrace);
}
}
};

Expand Down Expand Up @@ -482,10 +484,12 @@ private void logClientStats() {
}

// Output stats to logger.
String json = fvStats.toJson(statsControl.getPrettyPrint() ?
JsonOptions.PRETTY : null);
statsControl.getLogger().log(Level.INFO,
StatsControl.LOG_PREFIX + json);
if (statsControl.getLogger() != null) {
String json = fvStats.toJson(statsControl.getPrettyPrint() ?
JsonOptions.PRETTY : null);
statsControl.getLogger().log(Level.INFO,
StatsControl.LOG_PREFIX + json);
}
}

private MapValue generateFieldValueStats() {
Expand Down
3 changes: 2 additions & 1 deletion driver/src/main/java/oracle/nosql/driver/http/StatsControlImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public class StatsControlImpl

if (profile != Profile.NONE) {
if (config.getStatsEnableLog() &&
logger.getLevel().intValue() > Level.INFO.intValue()) {
( logger.getLevel() == null ||
logger.getLevel().intValue() > Level.INFO.intValue())) {
logger.setLevel(Level.INFO);
}
logger.log(Level.INFO, LOG_PREFIX +
Expand Down