Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unable to determine the status of the running process in LogIT without resteasy #2740

Merged
merged 3 commits into from
Jun 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,36 @@
*/
package org.apache.camel.quarkus.component.log.it;

import java.util.Optional;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.inject.Inject;

import org.apache.camel.ProducerTemplate;
import org.apache.camel.quarkus.main.events.AfterStart;
import org.eclipse.microprofile.config.inject.ConfigProperty;

@ApplicationScoped
public class LogResource {

public static final String LOG_MESSAGE = "Lets's fool io.quarkus.test.common.LauncherUtil.CaptureListeningDataReader: Listening on: http://0.0.0.0:";
@Inject
ProducerTemplate producerTemplate;

@ConfigProperty(name = "quarkus.http.test-port")
Optional<Integer> httpTestPort;
@ConfigProperty(name = "quarkus.http.port")
Optional<Integer> httpPort;

private int getEffectivePort() {
final boolean isNativeMode = "executable".equals(System.getProperty("org.graalvm.nativeimage.kind"));
Optional<Integer> portSource = isNativeMode ? httpPort : httpTestPort;
return portSource.isPresent() ? portSource.get().intValue() : 0;
}

public void info(@Observes AfterStart event) {
producerTemplate.sendBody("log:foo-topic", "Hello foo!");
producerTemplate.sendBody("log:foo-topic", LOG_MESSAGE + getEffectivePort());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class LogTest {
public void info() {
await().atMost(10L, TimeUnit.SECONDS).pollDelay(100, TimeUnit.MILLISECONDS).until(() -> {
String log = new String(Files.readAllBytes(Paths.get("target/quarkus.log")), StandardCharsets.UTF_8);
return log.contains("[foo-topic]") && log.contains("Body: Hello foo!");
return log.contains("[foo-topic]") && log.contains(LogResource.LOG_MESSAGE);
});

}
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends -->

<cassandra-quarkus.version>1.0.1</cassandra-quarkus.version><!-- https://repo1.maven.org/maven2/com/datastax/oss/quarkus/cassandra-quarkus-bom/ -->
<debezium.version>${debezium-version}</debezium.version><!-- https://repo1.maven.org/maven2/io/debezium/debezium-bom/ -->
<optaplanner.version>${optaplanner-version}</optaplanner.version><!-- https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse.freemarker.version>0.3.0.CR1</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
<quarkiverse-minio.version>0.2.3</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-minio.version>2.0.0.CR3</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkus.version>2.0.0.CR3</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-google-cloud.version>0.7.0</quarkus-google-cloud.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/googlecloudservices/quarkus-google-cloud-services-bom/ -->
<quarkus-hazelcast-client.version>1.2.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
Expand All @@ -66,7 +68,6 @@
<commons-lang.version>2.6</commons-lang.version><!-- used by hbase, should be pretty stable as commons-lang is not developed actively anymore -->
<commons-math3.version>3.6.1</commons-math3.version><!-- Mess in the transitive dependencies of Spark and hbase-testing-util -->
<curator.version>4.3.0</curator.version><!-- Mess in the transitive dependencies of Spark, Zookeeper and other hadoop related components -->
<debezium.version>${debezium-version}</debezium.version>
<derby.version>10.15.2.0</derby.version><!-- Spark -->
<eddsa.version>${eddsa-version}</eddsa.version>
<freemarker.version>2.3.31</freemarker.version><!-- @sync io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse.freemarker.version} prop:freemarker.version -->
Expand Down Expand Up @@ -108,7 +109,6 @@
<okhttp.version>${squareup-okhttp-version}</okhttp.version>
<okio.version>${squareup-okio-version}</okio.version>
<opencensus.version>0.28.0</opencensus.version><!-- mess in google-pubsub deps -->
<optaplanner.version>${optaplanner-version}</optaplanner.version>
<perfmark.version>0.23.0</perfmark.version><!-- mess in google-pubsub deps -->
<protobuf.version>${protobuf-version}</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
Expand Down