You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2020/11/24 08:53:03 UTC
[camel-quarkus] branch quarkus-master updated: Revert "nats: more
verbose output to help with #1978"
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/quarkus-master by this push:
new 3bda221 Revert "nats: more verbose output to help with #1978"
3bda221 is described below
commit 3bda22106a825611747a12952d7d4a426a0aa12b
Author: aldettinger <al...@gmail.com>
AuthorDate: Tue Nov 24 09:47:52 2020 +0100
Revert "nats: more verbose output to help with #1978"
This reverts commit 9401d0ccf6d55c89b628031558a19be912e9109a.
---
.../apache/camel/quarkus/component/nats/it/NatsConfiguration.java | 4 ----
.../org/apache/camel/quarkus/component/nats/it/NatsTestResource.java | 5 -----
2 files changed, 9 deletions(-)
diff --git a/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsConfiguration.java b/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsConfiguration.java
index 1192bf8..b270159 100644
--- a/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsConfiguration.java
+++ b/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsConfiguration.java
@@ -44,7 +44,6 @@ public class NatsConfiguration {
NatsComponent natsBasicAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsBasicAuthBrokerUrl);
- component.setVerbose(true);
return component;
}
@@ -52,7 +51,6 @@ public class NatsConfiguration {
NatsComponent natsNoAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsNoAuthBrokerUrl);
- component.setVerbose(true);
return component;
}
@@ -60,7 +58,6 @@ public class NatsConfiguration {
NatsComponent natsTlsAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsTlsAuthBrokerUrl);
- component.setVerbose(true);
return component;
}
@@ -68,7 +65,6 @@ public class NatsConfiguration {
NatsComponent natsTokenAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsTokenAuthBrokerUrl);
- component.setVerbose(true);
return component;
}
diff --git a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
index 829bd01..77e757b 100644
--- a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
+++ b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
@@ -23,7 +23,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.TestcontainersConfiguration;
@@ -51,7 +50,6 @@ public class NatsTestResource implements ContainerResourceLifecycleManager {
// Start the container needed for the basic authentication test
basicAuthContainer = new GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
.withCommand("-DV", "--user", BASIC_AUTH_USERNAME, "--pass", BASIC_AUTH_PASSWORD)
- .withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Server is ready.*", 1));
basicAuthContainer.start();
String basicAuthIp = basicAuthContainer.getContainerIpAddress();
@@ -61,7 +59,6 @@ public class NatsTestResource implements ContainerResourceLifecycleManager {
// Start the container needed for tests without authentication
noAuthContainer = new GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
- .withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Listening for route connections.*", 1));
noAuthContainer.start();
String noAuthIp = noAuthContainer.getContainerIpAddress();
@@ -79,7 +76,6 @@ public class NatsTestResource implements ContainerResourceLifecycleManager {
"--tlskey=/certs/key.pem",
"--tlsverify",
"--tlscacert=/certs/ca.pem")
- .withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Server is ready.*", 1));
tlsAuthContainer.start();
String tlsAuthIp = tlsAuthContainer.getContainerIpAddress();
@@ -89,7 +85,6 @@ public class NatsTestResource implements ContainerResourceLifecycleManager {
// Start the container needed for the token authentication test
tokenAuthContainer = new GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
.withCommand("-DV", "-auth", TOKEN_AUTH_TOKEN)
- .withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Server is ready.*", 1));
tokenAuthContainer.start();
String tokenAuthIp = tokenAuthContainer.getContainerIpAddress();