Skip to content

Commit 65ca24a

Browse files
committed
fix: Return the correct log level: max(loggerDelegate.getLevel(), minLogLevel).
1 parent 45b9f50 commit 65ca24a

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

src/main/java/org/jitsi/utils/logging2/LoggerImpl.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,30 @@ public void setLevel(Level level)
153153
@Override
154154
public Level getLevel()
155155
{
156+
Level level = loggerDelegate.getLevel();
157+
if (level != null && minLogLevel != null)
158+
{
159+
if (level.intValue() < minLogLevel.intValue())
160+
{
161+
return minLogLevel;
162+
}
163+
else
164+
{
165+
return level;
166+
}
167+
}
168+
if (level != null)
169+
{
170+
return level;
171+
}
172+
if (minLogLevel != null)
173+
{
174+
return minLogLevel;
175+
}
156176
// OpenJDK's Logger implementation initializes its effective level value
157177
// with Level.INFO.intValue(), but DOESN'T initialize the Level object.
158178
// So, if it hasn't been explicitly set, assume INFO.
159-
Level level = loggerDelegate.getLevel();
160-
return level != null ? level : Level.INFO;
179+
return Level.INFO;
161180
}
162181

163182
@Override

0 commit comments

Comments
 (0)