Updated Branches: refs/heads/flume-1.3.0 c2d58c56a -> 8b9e51324
FLUME-1470. Syslog source does not parse facility correctly (Mike Percy via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/8b9e5132 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/8b9e5132 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/8b9e5132 Branch: refs/heads/flume-1.3.0 Commit: 8b9e51324ff2571f52f448d1ea69eb0701c5dfe7 Parents: c2d58c5 Author: Hari Shreedharan <[email protected]> Authored: Wed Sep 12 11:42:35 2012 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Wed Sep 12 11:43:27 2012 -0700 ---------------------------------------------------------------------- .../java/org/apache/flume/source/SyslogUtils.java | 2 +- .../apache/flume/source/TestSyslogUdpSource.java | 6 +++- .../org/apache/flume/source/TestSyslogUtils.java | 16 ++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/8b9e5132/flume-ng-core/src/main/java/org/apache/flume/source/SyslogUtils.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/SyslogUtils.java b/flume-ng-core/src/main/java/org/apache/flume/source/SyslogUtils.java index a660d02..4cded11 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/source/SyslogUtils.java +++ b/flume-ng-core/src/main/java/org/apache/flume/source/SyslogUtils.java @@ -196,7 +196,7 @@ public class SyslogUtils { if(!isBadEvent){ pri = Integer.parseInt(prio.toString()); sev = pri % 8; - facility = pri - sev; + facility = pri / 8; formatHeaders(); } http://git-wip-us.apache.org/repos/asf/flume/blob/8b9e5132/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java index 3a7c486..2d7a429 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java +++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java @@ -92,11 +92,13 @@ public class TestSyslogUdpSource { logger.removeAppender(appender); Assert.assertNotNull(e); - Assert.assertEquals(e.getHeaders().get(SyslogUtils.SYSLOG_FACILITY), String.valueOf(SyslogAppender.LOG_FTP)); + Assert.assertEquals(String.valueOf(SyslogAppender.LOG_FTP / 8), + e.getHeaders().get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertArrayEquals(e.getBody(), "test flume syslog".getBytes()); Assert.assertNotNull(e2); - Assert.assertEquals(e2.getHeaders().get(SyslogUtils.SYSLOG_FACILITY), String.valueOf(SyslogAppender.LOG_FTP)); + Assert.assertEquals(String.valueOf(SyslogAppender.LOG_FTP / 8), + e2.getHeaders().get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertArrayEquals(e2.getBody(), "".getBytes()); } http://git-wip-us.apache.org/repos/asf/flume/blob/8b9e5132/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java index c29b40a..acfb29d 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java +++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java @@ -23,12 +23,10 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Map; - -import junit.framework.Assert; - import org.apache.flume.Event; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; +import org.junit.Assert; import org.junit.Test; public class TestSyslogUtils { @@ -237,7 +235,7 @@ public class TestSyslogUtils { throw new NullPointerException("Event is null"); } Map<String, String> headers = e.getHeaders(); - Assert.assertEquals("8", headers.get(SyslogUtils.SYSLOG_FACILITY)); + Assert.assertEquals("1", headers.get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertEquals("2", headers.get(SyslogUtils.SYSLOG_SEVERITY)); Assert.assertEquals(null, headers.get(SyslogUtils.EVENT_STATUS)); Assert.assertEquals(goodData1.trim(), new String(e.getBody()).trim()); @@ -273,7 +271,7 @@ public class TestSyslogUtils { throw new NullPointerException("Event is null"); } Map<String, String> headers2 = e2.getHeaders(); - Assert.assertEquals("8", headers2.get(SyslogUtils.SYSLOG_FACILITY)); + Assert.assertEquals("1", headers2.get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertEquals("2", headers2.get(SyslogUtils.SYSLOG_SEVERITY)); Assert.assertEquals(null, headers2.get(SyslogUtils.EVENT_STATUS)); @@ -295,7 +293,7 @@ public class TestSyslogUtils { throw new NullPointerException("Event is null"); } Map<String, String> headers2 = e2.getHeaders(); - Assert.assertEquals("8", headers2.get(SyslogUtils.SYSLOG_FACILITY)); + Assert.assertEquals("1", headers2.get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertEquals("2", headers2.get(SyslogUtils.SYSLOG_SEVERITY)); Assert.assertEquals(null, headers2.get(SyslogUtils.EVENT_STATUS)); @@ -364,7 +362,7 @@ public class TestSyslogUtils { throw new NullPointerException("Event is null"); } Map<String, String> headers = e.getHeaders(); - Assert.assertEquals("8", headers.get(SyslogUtils.SYSLOG_FACILITY)); + Assert.assertEquals("1", headers.get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertEquals("2", headers.get(SyslogUtils.SYSLOG_SEVERITY)); Assert.assertEquals(null, headers.get(SyslogUtils.EVENT_STATUS)); @@ -376,7 +374,7 @@ public class TestSyslogUtils { throw new NullPointerException("Event is null"); } Map<String, String> headers2 = e2.getHeaders(); - Assert.assertEquals("16", headers2.get(SyslogUtils.SYSLOG_FACILITY)); + Assert.assertEquals("2", headers2.get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertEquals("4", headers2.get(SyslogUtils.SYSLOG_SEVERITY)); Assert.assertEquals(null, headers.get(SyslogUtils.EVENT_STATUS)); @@ -395,7 +393,7 @@ public class TestSyslogUtils { throw new NullPointerException("Event is null"); } Map<String, String> headers = e.getHeaders(); - Assert.assertEquals("8", headers.get(SyslogUtils.SYSLOG_FACILITY)); + Assert.assertEquals("1", headers.get(SyslogUtils.SYSLOG_FACILITY)); Assert.assertEquals("2", headers.get(SyslogUtils.SYSLOG_SEVERITY)); Assert.assertEquals(SyslogUtils.SyslogStatus.INCOMPLETE.getSyslogStatus(), headers.get(SyslogUtils.EVENT_STATUS));
