Commit 94bf8942 by 罗志长

Revert: mqtt重连

parent 41429564
...@@ -42,12 +42,11 @@ public class MqttPushClient { ...@@ -42,12 +42,11 @@ public class MqttPushClient {
try { try {
client = new MqttClient(host, clientId, new MemoryPersistence()); client = new MqttClient(host, clientId, new MemoryPersistence());
MqttConnectOptions options = new MqttConnectOptions(); MqttConnectOptions options = new MqttConnectOptions();
options.setCleanSession(false); options.setCleanSession(true);
options.setUserName(username); options.setUserName(username);
options.setPassword(password.toCharArray()); options.setPassword(password.toCharArray());
options.setConnectionTimeout(timeout); options.setConnectionTimeout(timeout);
options.setKeepAliveInterval(keepalive); options.setKeepAliveInterval(keepalive);
options.setAutomaticReconnect(true);
MqttPushClient.setMqttClient(client); MqttPushClient.setMqttClient(client);
if (!client.isConnected()) { if (!client.isConnected()) {
try { try {
......
...@@ -99,22 +99,25 @@ public class PushCallback implements MqttCallbackExtended { ...@@ -99,22 +99,25 @@ public class PushCallback implements MqttCallbackExtended {
@Override @Override
public void connectionLost(Throwable cause) { public void connectionLost(Throwable cause) {
logger.info("连接断开,可以重连"); logger.info("连接断开,可以重连");
int times = 1; if (client == null || !client.isConnected()) {
while (client == null || !client.isConnected()) { mqttConfig.getMqttPushClient();
logger.info("重新连接, 第" + (times++) + "次"); }
MqttPushClient mqttPushClient = mqttConfig.getMqttPushClient(); // int times = 1;
if (mqttPushClient != null && mqttPushClient.getMqttClient() != null && mqttPushClient.getMqttClient().isConnected()) { // while (client == null || !client.isConnected()) {
logger.info("重连成功"); // logger.info("重新连接, 第" + (times++) + "次");
break; // MqttPushClient mqttPushClient = mqttConfig.getMqttPushClient();
} // if (mqttPushClient != null && mqttPushClient.getMqttClient() != null && mqttPushClient.getMqttClient().isConnected()) {
logger.info("重连失败"); // logger.info("重连成功");
// 每隔10秒重试一次 // break;
try { // }
TimeUnit.SECONDS.sleep(10); // logger.info("重连失败");
} catch (InterruptedException e) { // // 每隔10秒重试一次
e.printStackTrace(); // try {
} // TimeUnit.SECONDS.sleep(10);
} // } catch (InterruptedException e) {
// e.printStackTrace();
// }
// }
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment