Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3107 Fix TCP Syslog ApplicationEventPublisher

Browse Source 
No publisher was injected if the default embedded connection
factory was used.
This commit is contained in:
Gary Russell
2013-08-07 13:52:52 -04:00
parent ff56a31cd3
commit d6776b4889
4 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterFactoryBean.java
View File

@@ -17,6 +17,8 @@ package org.springframework.integration.syslog.config;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
@@ -34,7 +36,7 @@ import org.springframework.util.Assert;
*
*/
public class SyslogReceivingChannelAdapterFactoryBean extends AbstractFactoryBean<SyslogReceivingChannelAdapterSupport>
implements SmartLifecycle, BeanNameAware {
implements SmartLifecycle, BeanNameAware, ApplicationEventPublisherAware {
public enum Protocol { udp, tcp };
@@ -62,6 +64,8 @@ public class SyslogReceivingChannelAdapterFactoryBean extends AbstractFactoryBea
private volatile String beanName;
private volatile ApplicationEventPublisher applicationEventPublisher;
/**
* Instantiates a factory bean that creates a {@link UdpSyslogReceivingChannelAdapter}
* if the protocol is {@link Protocol#udp} or a {@link TcpSyslogReceivingChannelAdapter} if
@@ -109,6 +113,11 @@ public class SyslogReceivingChannelAdapterFactoryBean extends AbstractFactoryBea
this.converter = converter;
}
@Override
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
this.applicationEventPublisher = applicationEventPublisher;
}
@Override
public void start() {
if (this.adapter != null) {
@@ -168,6 +177,9 @@ public class SyslogReceivingChannelAdapterFactoryBean extends AbstractFactoryBea
Assert.isNull(this.port, "Cannot specify both 'port' and 'connectionFactory'");
((TcpSyslogReceivingChannelAdapter) adapter).setConnectionFactory(this.connectionFactory);
}
else if (this.applicationEventPublisher != null) {
((TcpSyslogReceivingChannelAdapter) adapter).setApplicationEventPublisher(this.applicationEventPublisher);
}
Assert.isNull(this.udpAdapter, "Cannot specifiy 'udp-attributes' when the protocol is 'tcp'");
}
else if(this.protocol == Protocol.udp) {

14
spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/TcpSyslogReceivingChannelAdapter.java
View File

@@ -16,6 +16,8 @@
package org.springframework.integration.syslog.inbound;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.integration.Message;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpListener;
@@ -30,10 +32,12 @@ import org.springframework.integration.ip.tcp.serializer.ByteArrayLfSerializer;
*
*/
public class TcpSyslogReceivingChannelAdapter extends SyslogReceivingChannelAdapterSupport
implements TcpListener {
implements TcpListener, ApplicationEventPublisherAware {
private volatile AbstractServerConnectionFactory connectionFactory;
private volatile ApplicationEventPublisher applicationEventPublisher;
/**
* @param connectionFactory
*/
@@ -41,12 +45,20 @@ public class TcpSyslogReceivingChannelAdapter extends SyslogReceivingChannelAdap
this.connectionFactory = connectionFactory;
}
@Override
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
this.applicationEventPublisher = applicationEventPublisher;
}
@Override
protected void onInit() {
super.onInit();
if (this.connectionFactory == null) {
this.connectionFactory = new TcpNioServerConnectionFactory(this.getPort());
this.connectionFactory.setDeserializer(new ByteArrayLfSerializer());
if (this.applicationEventPublisher != null) {
this.connectionFactory.setApplicationEventPublisher(this.applicationEventPublisher);
}
}
this.connectionFactory.registerListener(this);
}