From f5a94868c4f0d10f266497098fb2c2f5faf809ab Mon Sep 17 00:00:00 2001 From: "heavyrain.lee" Date: Wed, 10 Jul 2019 07:30:53 +0800 Subject: [PATCH] remove useless code --- broker/pom.xml | 6 --- .../java/io/moquette/BrokerConstants.java | 3 -- .../server/netty/BugSnagErrorsHandler.java | 41 ------------------- .../moquette/server/netty/NettyAcceptor.java | 10 +---- 4 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java diff --git a/broker/pom.xml b/broker/pom.xml index 6cb7cd16..3d24fa87 100755 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -132,12 +132,6 @@ 5.1.0 - - com.bugsnag - bugsnag - [3.0,4.0) - - commons-codec commons-codec diff --git a/broker/src/main/java/io/moquette/BrokerConstants.java b/broker/src/main/java/io/moquette/BrokerConstants.java index a11b287e..64ee53f0 100755 --- a/broker/src/main/java/io/moquette/BrokerConstants.java +++ b/broker/src/main/java/io/moquette/BrokerConstants.java @@ -65,9 +65,6 @@ public final class BrokerConstants { public static final String METRICS_LIBRATO_TOKEN_PROPERTY_NAME = "metrics.librato.token"; public static final String METRICS_LIBRATO_SOURCE_PROPERTY_NAME = "metrics.librato.source"; - public static final String BUGSNAG_ENABLE_PROPERTY_NAME = "use_bugsnag"; - public static final String BUGSNAG_TOKEN_PROPERTY_NAME = "bugsnag.token"; - public static final String STORAGE_CLASS_NAME = "storage_class"; public static final String QINIU_SERVER_URL= "qiniu.server_url"; diff --git a/broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java b/broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java deleted file mode 100644 index 1065ce1b..00000000 --- a/broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2012-2017 The original author or authors - * ------------------------------------------------------ - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * - * The Eclipse Public License is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * The Apache License v2.0 is available at - * http://www.opensource.org/licenses/apache2.0.php - * - * You may elect to redistribute this code under either of these licenses. - */ -package io.moquette.server.netty; - -import com.bugsnag.Bugsnag; -import io.moquette.server.config.IConfig; -import io.netty.channel.ChannelHandler.Sharable; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; - -import static io.moquette.BrokerConstants.BUGSNAG_TOKEN_PROPERTY_NAME; - -@Sharable -public class BugSnagErrorsHandler extends ChannelInboundHandlerAdapter { - - private Bugsnag bugsnag; - - public void init(IConfig props) { - final String token = props.getProperty(BUGSNAG_TOKEN_PROPERTY_NAME); - this.bugsnag = new Bugsnag(token); - } - - @Override - public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { - bugsnag.notify(cause); - ctx.fireExceptionCaught(cause); - } -} 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 8ec32b1e..3ddf6287 100644 --- a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java @@ -148,14 +148,8 @@ public class NettyAcceptor implements ServerAcceptor { this.metrics = Optional.empty(); } - final boolean useBugSnag = Boolean.parseBoolean(props.getProperty(BUGSNAG_ENABLE_PROPERTY_NAME, "false")); - if (useBugSnag) { - BugSnagErrorsHandler bugSnagHandler = new BugSnagErrorsHandler(); - bugSnagHandler.init(props); - this.errorsCather = Optional.of(bugSnagHandler); - } else { - this.errorsCather = Optional.empty(); - } + this.errorsCather = Optional.empty(); + initializePlainTCPTransport(mqttHandler, props); initializeWebSocketTransport(mqttHandler, props); String sslTcpPortProp = props.getProperty(BrokerConstants.SSL_PORT_PROPERTY_NAME);