修复：重连认证失败；publicExecutor线程池阻塞，导致认证失败，新增privateExecutor线程池

zhouhailin · Dec 15, 2021 · d9466ea · d9466ea · thd555 · Sep 13, 2023
1 parent 346fa60
commit d9466ea
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/...scloud/freeswitch/esl/spring/boot/starter/handler/AbstractInboundClientOptionHandler.java b/...scloud/freeswitch/esl/spring/boot/starter/handler/AbstractInboundClientOptionHandler.java
@@ -56,6 +56,7 @@ protected InboundClientOption newInboundClientOption() {
                 .rcvBufSize(properties.getRcvBufSize())
                 .workerGroupThread(properties.getWorkerGroupThread())
                 .publicExecutorThread(properties.getPublicExecutorThread())
+                .privateExecutorThread(properties.getPrivateExecutorThread())
                 .callbackExecutorThread(properties.getCallbackExecutorThread())
                 .defaultTimeoutSeconds(properties.getDefaultTimeoutSeconds())
                 .readTimeoutSeconds(properties.getReadTimeoutSeconds())

diff --git a/...ink/thingscloud/freeswitch/esl/spring/boot/starter/propeties/InboundClientProperties.java b/...ink/thingscloud/freeswitch/esl/spring/boot/starter/propeties/InboundClientProperties.java
@@ -37,6 +37,7 @@ public class InboundClientProperties {
     private int rcvBufSize = 65535;
     private int workerGroupThread = Runtime.getRuntime().availableProcessors() * 2;
     private int publicExecutorThread = Runtime.getRuntime().availableProcessors() * 2;
+    private int privateExecutorThread = Runtime.getRuntime().availableProcessors() * 2;
     private int callbackExecutorThread = Runtime.getRuntime().availableProcessors() * 2;
     private int defaultTimeoutSeconds = 5;
     private int readTimeoutSeconds = 30;

diff --git a/...esl/src/main/java/link/thingscloud/freeswitch/esl/inbound/AbstractNettyInboundClient.java b/...esl/src/main/java/link/thingscloud/freeswitch/esl/inbound/AbstractNettyInboundClient.java
@@ -48,6 +48,7 @@ abstract class AbstractNettyInboundClient implements ChannelEventListener, Inbou
     final Bootstrap bootstrap;
     final EventLoopGroup workerGroup;
     final ExecutorService publicExecutor;
+    final ExecutorService privateExecutor;
 
     final InboundClientOption option;
 
@@ -60,6 +61,8 @@ abstract class AbstractNettyInboundClient implements ChannelEventListener, Inbou
 
         publicExecutor = new ScheduledThreadPoolExecutor(option.publicExecutorThread(),
                 new DefaultThreadFactory("publicExecutor", true));
+        privateExecutor = new ScheduledThreadPoolExecutor(option.privateExecutorThread(),
+                new DefaultThreadFactory("privateExecutor", true));
 
         workerGroup = new NioEventLoopGroup(option.workerGroupThread());
         bootstrap.group(workerGroup)
@@ -80,7 +83,7 @@ protected void initChannel(SocketChannel ch) throws Exception {
                             pipeline.addLast("readTimeout", new ReadTimeoutHandler(option.readTimeoutSeconds()));
                         }
                         // now the inbound client logic
-                        pipeline.addLast("clientHandler", new InboundChannelHandler(AbstractNettyInboundClient.this, publicExecutor, option.disablePublicExecutor()));
+                        pipeline.addLast("clientHandler", new InboundChannelHandler(AbstractNettyInboundClient.this, publicExecutor, privateExecutor, option.disablePublicExecutor()));
                     }
                 });
     }

diff --git a/.../src/main/java/link/thingscloud/freeswitch/esl/inbound/handler/InboundChannelHandler.java b/.../src/main/java/link/thingscloud/freeswitch/esl/inbound/handler/InboundChannelHandler.java
@@ -56,6 +56,7 @@ public class InboundChannelHandler extends SimpleChannelInboundHandler<EslMessag
     private final Queue<SyncCallback> syncCallbacks = new ConcurrentLinkedQueue<>();
     private final ChannelEventListener listener;
     private final ExecutorService publicExecutor;
+    private final ExecutorService privateExecutor;
     private final boolean disablePublicExecutor;
     private Channel channel;
     private String remoteAddr;
@@ -69,9 +70,10 @@ public class InboundChannelHandler extends SimpleChannelInboundHandler<EslMessag
      * @param publicExecutor        a {@link java.util.concurrent.ExecutorService} object.
      * @param disablePublicExecutor a boolean.
      */
-    public InboundChannelHandler(ChannelEventListener listener, ExecutorService publicExecutor, boolean disablePublicExecutor) {
+    public InboundChannelHandler(ChannelEventListener listener, ExecutorService publicExecutor, ExecutorService privateExecutor, boolean disablePublicExecutor) {
         this.listener = listener;
         this.publicExecutor = publicExecutor;
+        this.privateExecutor = privateExecutor;
         this.disablePublicExecutor = disablePublicExecutor;
     }
 
@@ -151,7 +153,7 @@ private void handleEslMessage(EslMessage message) {
                 break;
             case EslHeaders.Value.AUTH_REQUEST:
                 log.debug("Auth request received [{}]", message);
-                publicExecutor.execute(() -> listener.handleAuthRequest(remoteAddr, this));
+                privateExecutor.execute(() -> listener.handleAuthRequest(remoteAddr, this));
                 break;
             case EslHeaders.Value.TEXT_DISCONNECT_NOTICE:
                 log.debug("Disconnect notice received [{}]", message);

diff --git a/...esl/src/main/java/link/thingscloud/freeswitch/esl/inbound/option/InboundClientOption.java b/...esl/src/main/java/link/thingscloud/freeswitch/esl/inbound/option/InboundClientOption.java
@@ -41,6 +41,7 @@ public class InboundClientOption {
 
     private int workerGroupThread = Runtime.getRuntime().availableProcessors() * 2;
     private int publicExecutorThread = Runtime.getRuntime().availableProcessors() * 2;
+    private int privateExecutorThread = Runtime.getRuntime().availableProcessors() * 2;
     private int callbackExecutorThread = Runtime.getRuntime().availableProcessors() * 2;
 
     private int defaultTimeoutSeconds = 5;
@@ -145,6 +146,26 @@ public InboundClientOption publicExecutorThread(int publicExecutorThread) {
         return this;
     }
 
+    /**
+     * <p>privateExecutorThread.</p>
+     *
+     * @return a int.
+     */
+    public int privateExecutorThread() {
+        return privateExecutorThread;
+    }
+
+    /**
+     * <p>privateExecutorThread.</p>
+     *
+     * @param privateExecutorThread a int.
+     * @return a {@link link.thingscloud.freeswitch.esl.inbound.option.InboundClientOption} object.
+     */
+    public InboundClientOption privateExecutorThread(int privateExecutorThread) {
+        this.privateExecutorThread = privateExecutorThread;
+        return this;
+    }
+
     /**
      * <p>callbackExecutorThread.</p>
      *