Fix the issue of file synchronization in live space when an incorrect…

… URL is configured
jd-opensource · Jun 3, 2024 · a38a7d6 · a38a7d6
1 parent 80ee4b8
commit a38a7d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...ore/joylive-core-api/src/main/java/com/jd/live/agent/core/service/AbstractFileSyncer.java b/...ore/joylive-core-api/src/main/java/com/jd/live/agent/core/service/AbstractFileSyncer.java
@@ -24,6 +24,7 @@
 import com.jd.live.agent.core.parser.ObjectParser;
 import com.jd.live.agent.core.service.file.FileContent;
 import com.jd.live.agent.core.service.file.FileDigest;
+import com.jd.live.agent.core.util.Futures;
 
 import java.io.*;
 import java.net.URISyntaxException;
@@ -56,7 +57,10 @@ public abstract class AbstractFileSyncer<T> extends AbstractSyncer<T, FileDigest
     protected CompletableFuture<Void> doStart() {
         config = getSyncConfig();
         file = getConfigFile();
-        if (file != null && publisher != null) {
+        if (file == null) {
+            return Futures.future(new FileNotFoundException("File is not found. " + getResource(config)));
+        }
+        if (publisher != null) {
             publisher.addHandler(handler);
         }
         return super.doStart();

diff --git a/...le/src/main/java/com/jd/live/agent/implement/service/policy/file/LiveSpaceFileSyncer.java b/...le/src/main/java/com/jd/live/agent/implement/service/policy/file/LiveSpaceFileSyncer.java
@@ -94,7 +94,12 @@ protected SyncConfig getSyncConfig() {
     @Override
     protected String getResource(SyncConfig config) {
         String result = super.getResource(config);
-        return result == null || result.isEmpty() ? CONFIG_LIVE_SPACE : result;
+        if (result == null || result.isEmpty()) {
+            return CONFIG_LIVE_SPACE;
+        } else if (result.startsWith("http://") || result.startsWith("https://")) {
+            return CONFIG_LIVE_SPACE;
+        }
+        return result;
     }
 
     @Override