Skip to content

Commit d9fe7d5

Browse files
committed
Adapt broker Docker image for PR
1 parent 51f5ade commit d9fe7d5

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

.github/workflows/test-pr.yml

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
cache: 'maven'
2525
- name: Start broker
2626
run: ci/start-broker.sh
27+
env:
28+
RABBITMQ_IMAGE: 'pivotalrabbitmq/rabbitmq:token-expiration-in-stream-connections-otp-max-bazel'
2729
- name: Test
2830
run: |
2931
./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \

src/main/java/com/rabbitmq/stream/impl/StreamEnvironment.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,12 @@ private Address address() {
974974
}
975975

976976
private String label() {
977-
return address.host() + ":" + address.port();
977+
Client c = this.nullableClient();
978+
if (c == null) {
979+
return address.host() + ":" + address.port();
980+
} else {
981+
return c.getHost() + ":" + c.getPort();
982+
}
978983
}
979984

980985
@Override

src/test/resources/logback-test.xml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</appender>
77

88
<logger name="com.rabbitmq.stream" level="warn" />
9+
<!-- <logger name="com.rabbitmq.stream.impl.DefaultExecutorServiceFactory" level="warn" />-->
910

1011
<logger name="com.rabbitmq.stream.perf.Version" level="error" />
1112

0 commit comments

Comments
 (0)