Skip to content

GH-2874: Syslog - copy IpHeaders to message #2876

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

Merged
merged 1 commit into from
Apr 1, 2019
Merged

GH-2874: Syslog - copy IpHeaders to message #2876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...-syslog/src/main/java/org/springframework/integration/syslog/DefaultMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public Message<?> fromSyslog(Message<?> message) {
}
}
return getMessageBuilderFactory().withPayload(this.asMap ? map : message.getPayload())
.copyHeaders(message.getHeaders())
.copyHeaders(out)
.build();
}
Expand Down
3 changes: 2 additions & 1 deletion ...-syslog/src/main/java/org/springframework/integration/syslog/RFC5424MessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ public Message<?> fromSyslog(Message<?> message) {
}

AbstractIntegrationMessageBuilder<Object> builder = getMessageBuilderFactory().withPayload(
asMap() ? map : originalContent);
asMap() ? map : originalContent)
.copyHeaders(message.getHeaders());
if (!asMap() && isMap) {
builder.copyHeaders(map);
}
Expand Down
6 changes: 6 additions & 0 deletions ...va/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.ip.IpHeaders;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNioServerConnectionFactory;
import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter;
Expand Down Expand Up @@ -84,6 +85,7 @@ public void testUdp() throws Exception {
Message<?> message = outputChannel.receive(10000);
assertThat(message).isNotNull();
assertThat(message.getHeaders().get("syslog_HOST")).isEqualTo("WEBERN");
assertThat(message.getHeaders().get(IpHeaders.IP_ADDRESS)).isNotNull();
adapter.stop();
}

Expand Down Expand Up @@ -128,6 +130,7 @@ public void testTcp() throws Exception {
Message<?> message = outputChannel.receive(10000);
assertThat(message).isNotNull();
assertThat(message.getHeaders().get("syslog_HOST")).isEqualTo("WEBERN");
assertThat(message.getHeaders().get(IpHeaders.IP_ADDRESS)).isNotNull();
adapter.stop();
assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
}
Expand Down Expand Up @@ -161,6 +164,7 @@ public void testAsMapFalse() throws Exception {
assertThat(message.getHeaders().get("syslog_HOST")).isEqualTo("WEBERN");
assertThat(new String((byte[]) message.getPayload(), "UTF-8"))
.isEqualTo("<157>JUL 26 22:08:35 WEBERN TESTING[70729]: TEST SYSLOG MESSAGE");
assertThat(message.getHeaders().get(IpHeaders.IP_ADDRESS)).isNotNull();
adapter.stop();
}

Expand Down Expand Up @@ -210,6 +214,7 @@ public void testTcpRFC5424() throws Exception {
Message<Map<String, ?>> message = (Message<Map<String, ?>>) outputChannel.receive(10000);
assertThat(message).isNotNull();
assertThat(message.getPayload().get("syslog_HOST")).isEqualTo("loggregator");
assertThat(message.getHeaders().get(IpHeaders.IP_ADDRESS)).isNotNull();
adapter.stop();
assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
}
Expand Down Expand Up @@ -243,6 +248,7 @@ public void testUdpRFC5424() throws Exception {
Message<Map<String, ?>> message = (Message<Map<String, ?>>) outputChannel.receive(10000);
assertThat(message).isNotNull();
assertThat(message.getPayload().get("syslog_HOST")).isEqualTo("loggregator");
assertThat(message.getHeaders().get(IpHeaders.IP_ADDRESS)).isNotNull();
adapter.stop();
}

Expand Down