Skip to content
This repository has been archived by the owner on Jun 29, 2023. It is now read-only.

Commit

Permalink
Close GelfSender on Appender lifecycle termination #243
Browse files Browse the repository at this point in the history
GelfLogAppender now overrides the proper lifecycle method to intercept the stop() signal.
  • Loading branch information
mp911de committed May 12, 2020
1 parent 34a0b7b commit 482c5c3
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.apache.logging.log4j.core.layout.PatternLayout.newBuilder;

import java.util.Collections;
import java.util.concurrent.TimeUnit;

import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Filter;
Expand Down Expand Up @@ -375,19 +376,23 @@ public void reportError(String message, Exception exception) {
}

@Override
public void stop() {
protected boolean stop(long timeout, TimeUnit timeUnit, boolean changeLifeCycleState) {

if (null != gelfSender) {
Closer.close(gelfSender);
gelfSender = null;
}
super.stop();

return super.stop(timeout, timeUnit, changeLifeCycleState);
}

@Override
public void start() {

if (null == gelfSender) {
gelfSender = createGelfSender();
}

super.start();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package biz.paluch.logging.gelf.log4j2;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

import java.util.concurrent.TimeUnit;

import org.junit.jupiter.api.Test;

import biz.paluch.logging.gelf.MdcGelfMessageAssembler;
import biz.paluch.logging.gelf.intern.GelfSender;

/**
* Unit tests for {@link GelfLogAppender}.
*
* @author Mark Paluch
*/
class GelfLogAppenderUnitTests {

@Test
void testStop() {

GelfSender sender = mock(GelfSender.class);

GelfLogAppender sut = new GelfLogAppender("name", null, new MdcGelfMessageAssembler(), true);
sut.gelfSender = sender;

sut.stop();

verify(sender).close();
}

@Test
void testStopWithTimeout() {

GelfSender sender = mock(GelfSender.class);

GelfLogAppender sut = new GelfLogAppender("name", null, new MdcGelfMessageAssembler(), true);
sut.gelfSender = sender;

sut.stop(0, TimeUnit.SECONDS);

verify(sender).close();
}
}

0 comments on commit 482c5c3

Please sign in to comment.