diff --git a/RELEASE-zh.md b/RELEASE-zh.md index d919e29da..f2a99e706 100644 --- a/RELEASE-zh.md +++ b/RELEASE-zh.md @@ -1,5 +1,9 @@ # 发布历史 +## 1.5.2 + +1. 策略定时更新的热修复 + ## 1.5.1 1. 针对泳道策略的热修复 diff --git a/RELEASE.md b/RELEASE.md index 7caa584c5..902c2b0a3 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,9 @@ # Release History +## 1.5.2 + +1. Hot fix for policy timed update + ## 1.5.1 1. Hot fix for swimlane policy diff --git a/joylive-bom/pom.xml b/joylive-bom/pom.xml index ba4459f25..a76337a3f 100644 --- a/joylive-bom/pom.xml +++ b/joylive-bom/pom.xml @@ -48,7 +48,7 @@ - 1.5.1 + 1.5.2 diff --git a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/file/FileWatcher.java b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/file/FileWatcher.java index 8de1ac8f0..3ac8d0bae 100644 --- a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/file/FileWatcher.java +++ b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/file/FileWatcher.java @@ -83,6 +83,7 @@ public FileWatcher(String name, SyncConfig config, Publisher publishe .condition(this::isStarted) .runnable(this::run) .build(); + this.daemon.start(); if (publisher != null) { publisher.addHandler(handler); } diff --git a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/http/HttpWatcher.java b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/http/HttpWatcher.java index 9c62f4e4c..1f0b729ae 100644 --- a/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/http/HttpWatcher.java +++ b/joylive-core/joylive-governance-api/src/main/java/com/jd/live/agent/governance/service/sync/http/HttpWatcher.java @@ -72,6 +72,7 @@ public HttpWatcher(String name, SyncConfig config, Application application) { .condition(this::isStarted) .runnable(this::run) .build(); + this.daemon.start(); } @Override diff --git a/joylive-package/src/main/assembly/config/config.yaml b/joylive-package/src/main/assembly/config/config.yaml index 8c224b9d2..9fbd2080f 100644 --- a/joylive-package/src/main/assembly/config/config.yaml +++ b/joylive-package/src/main/assembly/config/config.yaml @@ -85,7 +85,10 @@ agent: liveServiceTemplate: ${CONFIG_NACOS_KEY_LIVE_SERVICE_TEMPLATE:govern-liveService-${name}} laneSpace: type: ${CONFIG_LANE_SPACE_API_TYPE:file} # [file,jmsf,nacos] - url: ${CONFIG_LANE_SPACE_API_URL:http:http://api.jmsf.local:8080/v1} + url: ${CONFIG_LANE_SPACE_API_URL:http://api.jmsf.local:8080/v1} + interval: 5000 + timeout: 3000 + initialTimeout: 20000 # for jmsf jmsf: spacesUrl: /laneSpaces diff --git a/pom.xml b/pom.xml index 9c0608111..4521631e2 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ - 1.5.1 + 1.5.2 1.18.34 4.11.0 5.10.1