Skip to content
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

Jump to bottom

Problem: syslog4j does not support localName #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Problem: syslog4j does not support localName #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f39b868
Problem: Eclipse files are not ignored by git
Mar 19, 2018
33a73d7
Problem: syslog4j does not support localName
Mar 19, 2018
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
target
.idea
*.iml
.classpath
.project
.settings
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
</dependency>

<dependency>
<groupId>org.syslog4j</groupId>
<groupId>org.graylog2</groupId>
<artifactId>syslog4j</artifactId>
<version>0.9.30</version>
<version>0.9.60</version>
</dependency>

<dependency>
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/com/papertrailapp/logback/Syslog4jAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
package com.papertrailapp.logback;

import org.graylog2.syslog4j.SyslogConfigIF;
import org.graylog2.syslog4j.SyslogIF;
import org.graylog2.syslog4j.SyslogRuntimeException;

import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.classic.util.LevelToSyslogSeverity;
import ch.qos.logback.core.AppenderBase;
import ch.qos.logback.core.Layout;
import org.productivity.java.syslog4j.SyslogConfigIF;
import org.productivity.java.syslog4j.SyslogIF;
import org.productivity.java.syslog4j.SyslogRuntimeException;

public class Syslog4jAppender<E> extends AppenderBase<E> {

SyslogIF syslog;
SyslogConfigIF syslogConfig;
Layout<E> layout;

@Override
protected void append(E loggingEvent) {
syslog.log(getSeverityForEvent(loggingEvent), layout.doLayout(loggingEvent));
}
}

@Override
public void start() {
Expand All @@ -42,7 +44,7 @@ public void start() {
public void stop() {
super.stop();

synchronized(this) {
synchronized (this) {
if (syslog != null) {
syslog.shutdown();
syslog = null;
Expand Down
37 changes: 20 additions & 17 deletions src/test/java/com/papertrailapp/logback/Syslog4jAppenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,45 @@
package com.papertrailapp.logback;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;

import org.graylog2.syslog4j.server.SyslogServer;
import org.graylog2.syslog4j.server.impl.event.printstream.PrintStreamSyslogServerEventHandler;
import org.graylog2.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfig;
import org.graylog2.syslog4j.server.impl.net.tcp.ssl.SSLTCPNetSyslogServerConfig;
import org.graylog2.syslog4j.server.impl.net.udp.UDPNetSyslogServerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.joran.JoranConfigurator;
import ch.qos.logback.core.joran.spi.JoranException;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.productivity.java.syslog4j.server.SyslogServer;
import org.productivity.java.syslog4j.server.impl.event.printstream.PrintStreamSyslogServerEventHandler;
import org.productivity.java.syslog4j.server.impl.net.tcp.TCPNetSyslogServerConfig;
import org.productivity.java.syslog4j.server.impl.net.tcp.ssl.SSLTCPNetSyslogServerConfig;
import org.productivity.java.syslog4j.server.impl.net.udp.UDPNetSyslogServerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;

public class Syslog4jAppenderTest extends TestCase {

ByteArrayOutputStream serverStream;

/**
* Create the test case
*
* @param testName name of the test case
* @param testName
* name of the test case
*/
public Syslog4jAppenderTest(String testName)
{
super( testName );
public Syslog4jAppenderTest(String testName) {
super(testName);
}

/**
* @return the suite of tests being tested
*/
public static Test suite()
{
return new TestSuite( Syslog4jAppenderTest.class );
public static Test suite() {
return new TestSuite(Syslog4jAppenderTest.class);
}

@Override
protected void setUp() {
serverStream = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(serverStream);
Expand All @@ -61,6 +63,7 @@ protected void setUp() {
SyslogServer.createThreadedInstance("testTls", ssltcpNetSyslogServerConfig);
}

@Override
protected void tearDown() {
SyslogServer.shutdown();
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/logback-syslog4j-tcp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<pattern>%date %-5level %logger{35} - %message%n</pattern>
</layout>

<syslogConfig class="org.productivity.java.syslog4j.impl.net.tcp.TCPNetSyslogConfig">
<syslogConfig class="org.graylog2.syslog4j.impl.net.tcp.TCPNetSyslogConfig">
<host>localhost</host>
<port>45553</port>
<ident>syslog-test</ident>
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/logback-syslog4j-tls.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<pattern>%date %-5level %logger{35} - %message%n</pattern>
</layout>

<syslogConfig class="org.productivity.java.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogConfig">
<syslogConfig class="org.graylog2.syslog4j.impl.net.tcp.ssl.SSLTCPNetSyslogConfig">
<host>localhost</host>
<port>45554</port>
<ident>syslog-test</ident>
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/logback-syslog4j-udp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<pattern>%date %-5level %logger{35} - %message%n</pattern>
</layout>

<syslogConfig class="org.productivity.java.syslog4j.impl.net.udp.UDPNetSyslogConfig">
<syslogConfig class="org.graylog2.syslog4j.impl.net.udp.UDPNetSyslogConfig">
<host>localhost</host>
<port>45553</port>
<ident>syslog-test</ident>
Expand Down