You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/07/27 23:11:12 UTC
[camel-karavan] branch main updated: devservices logs #817
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 bfea322c devservices logs #817
bfea322c is described below
commit bfea322c41d35cee79d8e7c2d04c0c3c46636a04
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Jul 27 19:11:03 2023 -0400
devservices logs #817
---
.../main/java/org/apache/camel/karavan/docker/model/DevService.java | 6 +++---
.../main/java/org/apache/camel/karavan/service/EventService.java | 1 -
.../karavan-app/src/main/resources/services/dev-services.yaml | 1 +
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/model/DevService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/model/DevService.java
index 2c0b4e30..af218774 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/model/DevService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/model/DevService.java
@@ -11,7 +11,7 @@ public class DevService {
private String restart;
private List<String> ports;
private List<String> expose;
- private String depends_on;
+ private List<String> depends_on;
private Map<String,String> environment;
private HealthCheckConfig healthcheck;
@@ -58,11 +58,11 @@ public class DevService {
this.expose = expose;
}
- public String getDepends_on() {
+ public List<String> getDepends_on() {
return depends_on;
}
- public void setDepends_on(String depends_on) {
+ public void setDepends_on(List<String> depends_on) {
this.depends_on = depends_on;
}
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/EventService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/EventService.java
index ea858d05..073f6dbd 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/EventService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/EventService.java
@@ -78,7 +78,6 @@ public class EventService {
void receiveCommand(String projectId) {
LOGGER.info("DEVMODE_CONTAINER_READY " + projectId);
ContainerStatus status = infinispanService.getContainerStatus(projectId, environment, projectId);
- System.out.println(status);
if (status != null && !status.getCodeLoaded() && status.getContainerId() != null && status.getState().equals(ContainerStatus.State.running.name())) {
if (ConfigService.inKubernetes()) {
camelService.reloadProjectCode(projectId);
diff --git a/karavan-web/karavan-app/src/main/resources/services/dev-services.yaml b/karavan-web/karavan-app/src/main/resources/services/dev-services.yaml
index 75c5c30e..1365fd9a 100644
--- a/karavan-web/karavan-app/src/main/resources/services/dev-services.yaml
+++ b/karavan-web/karavan-app/src/main/resources/services/dev-services.yaml
@@ -34,6 +34,7 @@ services:
- 29092:29092
environment:
KAFKA_BROKER_ID: 1
+ AUTO_CREATE_TOPICS: true
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT