Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Commit 77b9cbe

Browse files
authored
Remove all static binders (#17)
It closes #15 Gitlab issue
1 parent d6aaeb0 commit 77b9cbe

File tree

12 files changed

+10
-281
lines changed

12 files changed

+10
-281
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
<properties>
6868
<!-- version -->
69-
<revision>3.0.2</revision>
69+
<revision>3.1.0</revision>
7070
<changelist>-SNAPSHOT</changelist>
7171
<sha1/>
7272
<!-- java and maven -->

src/main/java/org/slf4j/impl/StaticLoggerBinder.java

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

src/main/java/org/slf4j/impl/StaticMDCBinder.java

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

src/main/java/org/slf4j/impl/StaticMarkerBinder.java

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

src/main/java/org/slf4j/impl/package-info.java

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

src/main/java/uk/bot_by/aws_lambda/slf4j/AWSLambdaServiceProvider.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public class AWSLambdaServiceProvider implements SLF4JServiceProvider {
3838
// to avoid constant folding by the compiler, this field must *not* be final
3939
public static String REQUESTED_API_VERSION = "2.0.99"; // !final
4040

41-
private ILoggerFactory loggerFactory;
42-
private IMarkerFactory markerFactory;
43-
private MDCAdapter contextMapAdapter;
41+
private static final ILoggerFactory loggerFactory = new LambdaLoggerFactory();
42+
private static final IMarkerFactory markerFactory = new BasicMarkerFactory();
43+
private static final MDCAdapter contextMapAdapter = new BasicMDCAdapter();
4444

4545
@Override
4646
public ILoggerFactory getLoggerFactory() {
@@ -64,9 +64,7 @@ public String getRequestedApiVersion() {
6464

6565
@Override
6666
public void initialize() {
67-
loggerFactory = new LambdaLoggerFactory();
68-
markerFactory = new BasicMarkerFactory();
69-
contextMapAdapter = new BasicMDCAdapter();
67+
// initialized by static fields
7068
}
7169

7270
}

src/main/java/uk/bot_by/aws_lambda/slf4j/LambdaLogger.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.jetbrains.annotations.NotNull;
2222
import org.jetbrains.annotations.VisibleForTesting;
2323
import org.slf4j.Logger;
24+
import org.slf4j.LoggerFactory;
2425
import org.slf4j.Marker;
2526
import org.slf4j.event.Level;
2627
import org.slf4j.helpers.FormattingTuple;
2728
import org.slf4j.helpers.MessageFormatter;
28-
import org.slf4j.impl.StaticLoggerBinder;
2929

3030
/**
3131
* An SLF4J {@link org.slf4j.Logger} implementation for <a href="https://aws.amazon.com/lambda/">AWS
@@ -410,7 +410,7 @@ private boolean isLevelEnabled(Level level, Marker marker) {
410410
}
411411

412412
private Object readResolve() throws ObjectStreamException {
413-
return StaticLoggerBinder.getSingleton().getLoggerFactory().getLogger(getName());
413+
return LoggerFactory.getLogger(getName());
414414
}
415415

416416
}

src/main/java/uk/bot_by/aws_lambda/slf4j/LoggerUtil.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525
import org.jetbrains.annotations.Nullable;
2626
import org.slf4j.MDC;
2727
import org.slf4j.event.Level;
28-
import org.slf4j.impl.StaticLoggerBinder;
2928

3029
class LoggerUtil {
3130

32-
private static final long START_TIME = System.currentTimeMillis();
31+
private static final Long START_TIME = System.currentTimeMillis();
3332

3433
private static final String ANY_NEW_LINE = "[\r\n]+";
3534
private static final String CARRIAGE_RETURN = "\r";
@@ -60,7 +59,7 @@ static void log(@NotNull LoggerConfiguration configuration,
6059
builder.append(CARRIAGE_RETURN).append(stackTraceOutputStream);
6160
}
6261

63-
synchronized (StaticLoggerBinder.getSingleton()) {
62+
synchronized (START_TIME) {
6463
printStream.println(builder);
6564
printStream.flush();
6665
}
@@ -114,7 +113,7 @@ private static void addTimestampOrRequestId(LoggerConfiguration configuration,
114113
private static String getFormattedDate(DateFormat dateFormat) {
115114
String dateText;
116115

117-
synchronized (StaticLoggerBinder.getSingleton()) {
116+
synchronized (START_TIME) {
118117
dateText = dateFormat.format(new Date());
119118
}
120119

src/test/java/org/slf4j/impl/StaticLoggerBinderTest.java

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

src/test/java/org/slf4j/impl/StaticMDCBinderTest.java

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

0 commit comments

Comments
 (0)