This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 3da76e97 Updates for #1115
3da76e97 is described below
commit 3da76e97f52a0bc9ec288c76db3e46efbbcc8241
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Thu Feb 8 18:28:14 2024 -0500
Updates for #1115
---
.../camel/karavan/cache/KaravanCacheService.java | 12 +++++------
.../karavan-app/src/main/resources/hazelcast.xml | 21 -------------------
.../karavan-app/src/main/resources/hazelcast.yaml | 24 ++++++++++++++++++++++
.../src/main/webui/src/project/ProjectPage.tsx | 1 +
4 files changed, 30 insertions(+), 28 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
index 34b33dd4..a8aa1086 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.karavan.cache;
-import com.hazelcast.config.ClasspathXmlConfig;
+import com.hazelcast.config.ClasspathYamlConfig;
import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
@@ -29,7 +29,6 @@ import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Singleton;
import org.apache.camel.karavan.cache.model.*;
-import org.eclipse.microprofile.health.Readiness;
import org.jboss.logging.Logger;
import java.io.BufferedReader;
@@ -41,11 +40,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
@Default
-@Readiness
@Singleton
public class KaravanCacheService {
- Config config = new ClasspathXmlConfig("hazelcast.xml");
+ Config config = new ClasspathYamlConfig("hazelcast.yaml");
HazelcastInstance hz = Hazelcast.getOrCreateHazelcastInstance(config);
private final IMap<GroupedKey, Project> projects =
hz.getMap(Project.CACHE);
@@ -94,9 +92,9 @@ public class KaravanCacheService {
public ProjectFile getProjectFile(String projectId, String filename) {
Predicate<GroupedKey, ProjectFile> predicate = Predicates.and(
- Predicates.equal("name", filename),
- Predicates.equal("projectId", projectId)
- );
+ Predicates.equal("name", filename),
+ Predicates.equal("projectId", projectId)
+ );
List<ProjectFile> list = files.values(predicate).stream().toList();
return !list.isEmpty() ? list.get(0) : null;
}
diff --git a/karavan-web/karavan-app/src/main/resources/hazelcast.xml
b/karavan-web/karavan-app/src/main/resources/hazelcast.xml
deleted file mode 100644
index 37836362..00000000
--- a/karavan-web/karavan-app/src/main/resources/hazelcast.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<hazelcast xmlns="http://www.hazelcast.com/schema/config";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.hazelcast.com/schema/config
- http://www.hazelcast.com/schema/config/hazelcast-config-5.3.xsd";>
- <cluster-name>karavan</cluster-name>
- <instance-name>karavan</instance-name>
- <jet enabled="false" resource-upload-enabled="false"/>
- <integrity-checker enabled="false"/>
- <network>
- <port auto-increment="true">5900</port>
- <outbound-ports>
- <ports>0</ports>
- </outbound-ports>
- <join>
- <auto-detection enabled="false"/>
- <multicast enabled="false"/>
- <tcp-ip enabled="false"/>
- </join>
- </network>
- <metrics enabled="false"/>
-</hazelcast>
diff --git a/karavan-web/karavan-app/src/main/resources/hazelcast.yaml
b/karavan-web/karavan-app/src/main/resources/hazelcast.yaml
new file mode 100644
index 00000000..149ddfe0
--- /dev/null
+++ b/karavan-web/karavan-app/src/main/resources/hazelcast.yaml
@@ -0,0 +1,24 @@
+hazelcast:
+ cluster-name: karavan
+ instance-name: karavan
+ jet:
+ enabled: false
+ resource-upload-enabled: false
+ integrity-checker:
+ enabled: false
+ network:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 5900
+ outbound-ports:
+ ports: 0
+ join:
+ auto-detection:
+ enabled: false
+ multicast:
+ enabled: false
+ tcp-ip:
+ enabled: false
+ metrics:
+ enabled: false
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx
index 59950bb6..6ed5ad4e 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx
@@ -62,6 +62,7 @@ export function ProjectPage() {
const interval = setInterval(() => {
if (tabIndex === 'build' || tabIndex === 'container') {
ProjectService.refreshAllContainerStatuses();
+ ProjectService.refreshAllDeploymentStatuses();
ProjectService.refreshImages(project.projectId);
}
}, 2000)
