[shardingsphere-elasticjob] branch master updated: Polish SnapshotService (#1738)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git


The following commit(s) were added to refs/heads/master by this push:
     new 096982d  Polish SnapshotService (#1738)
096982d is described below

commit 096982dd8785fbc47d9cda85689f5310e2e7b3d1
Author: 吴伟杰 <root496879...@me.com>
AuthorDate: Sat Nov 28 00:23:01 2020 +0800

    Polish SnapshotService (#1738)
---
 .../lite/internal/snapshot/SnapshotService.java           | 15 +++++++--------
 .../internal/snapshot/SnapshotServiceDisableTest.java     |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git 
a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java
 
b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java
index 311bfa4..f27cbc0 100644
--- 
a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java
+++ 
b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotService.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.elasticjob.lite.internal.snapshot;
 
+import com.google.common.base.Preconditions;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.apache.curator.framework.recipes.cache.CuratorCache;
@@ -51,6 +52,7 @@ public final class SnapshotService {
     private volatile boolean closed;
     
     public SnapshotService(final CoordinatorRegistryCenter regCenter, final 
int port) {
+        Preconditions.checkArgument(port >= 0 && port <= 0xFFFF, "Port value 
out of range: " + port);
         this.regCenter = regCenter;
         this.port = port;
     }
@@ -59,20 +61,17 @@ public final class SnapshotService {
      * Start to listen.
      */
     public void listen() {
-        if (port < 0) {
-            log.error("Elastic job: Snapshot service port must greater than 0, 
the port is '{}'", port);
-            throw new RuntimeException("config Snapshot service port must 
greater than 0.");
-        }
         try {
-            log.info("Elastic job: Snapshot service is running, the port is 
'{}'", port);
+            log.info("ElasticJob: Snapshot service is running on port '{}'", 
port);
             openSocket(port);
         } catch (final IOException ex) {
-            log.error("Elastic job: Snapshot service listen failure, error is: 
", ex);
+            log.error("ElasticJob: Snapshot service listen failure, error is: 
", ex);
         }
     }
     
     private void openSocket(final int port) throws IOException {
         serverSocket = new ServerSocket(port);
+        String threadName = String.format("elasticjob-snapshot-service-%d", 
port);
         new Thread(() -> {
             while (!closed) {
                 try {
@@ -81,10 +80,10 @@ public final class SnapshotService {
                     if (isIgnoredException()) {
                         return;
                     }
-                    log.error("Elastic job: Snapshot service open socket 
failure, error is: ", ex);
+                    log.error("ElasticJob: Snapshot service open socket 
failure, error is: ", ex);
                 }
             }
-        }).start();
+        }, threadName).start();
     }
     
     private boolean isIgnoredException() {
diff --git 
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java
 
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java
index d136509..33c56cf 100644
--- 
a/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java
+++ 
b/elasticjob-lite/elasticjob-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/snapshot/SnapshotServiceDisableTest.java
@@ -38,7 +38,7 @@ public final class SnapshotServiceDisableTest extends 
BaseSnapshotServiceTest {
         SocketUtils.sendCommand(SnapshotService.DUMP_COMMAND, DUMP_PORT - 1);
     }
     
-    @Test(expected = RuntimeException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void assertPortInvalid() {
         SnapshotService snapshotService = new SnapshotService(getREG_CENTER(), 
-1);
         snapshotService.listen();