diff --git a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java index 3ddf6287..8e161d62 100644 --- a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java @@ -151,7 +151,6 @@ public class NettyAcceptor implements ServerAcceptor { this.errorsCather = Optional.empty(); initializePlainTCPTransport(mqttHandler, props); - initializeWebSocketTransport(mqttHandler, props); String sslTcpPortProp = props.getProperty(BrokerConstants.SSL_PORT_PROPERTY_NAME); String wssPortProp = props.getProperty(BrokerConstants.WSS_PORT_PROPERTY_NAME); if (sslTcpPortProp != null || wssPortProp != null) { @@ -233,42 +232,6 @@ public class NettyAcceptor implements ServerAcceptor { }); } - private void initializeWebSocketTransport(final NettyMQTTHandler handler, IConfig props) throws IOException { - LOG.info("Configuring Websocket MQTT transport"); - String webSocketPortProp = props.getProperty(WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); - if (DISABLED_PORT_BIND.equals(webSocketPortProp)) { - // Do nothing no WebSocket configured - LOG.info("Property {} has been setted to {}. Websocket MQTT will be disabled", - BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); - return; - } - int port = Integer.parseInt(webSocketPortProp); - - final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler(); - - String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME); - initFactory(host, port, "Websocket MQTT", new PipelineInitializer() { - - @Override - void init(ChannelPipeline pipeline) { - pipeline.addLast(new HttpServerCodec()); - pipeline.addLast("aggregator", new HttpObjectAggregator(65536)); - pipeline.addLast("webSocketHandler", - new WebSocketServerProtocolHandler("/", MQTT_SUBPROTOCOL_CSV_LIST)); - pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder()); - pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder()); - pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0)); - pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler); - pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector)); - pipeline.addLast("decoder", new MqttDecoder()); - pipeline.addLast("encoder", MqttEncoder.INSTANCE); - pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector)); - pipeline.addLast("messageLogger", new MQTTMessageLogger()); - pipeline.addLast("handler", handler); - } - }); - } - private void initializeSSLTCPTransport(final NettyMQTTHandler handler, IConfig props, final SSLContext sslContext) throws IOException { LOG.info("Configuring SSL MQTT transport");