Skip to content

Commit 91122e2

Browse files
authored
fix: use Started instead of listening (#167)
* fix: use Started instead of listening To avoid breaking existing clients of Ryuk, using a custom Ryuk version with older testcontainers versions. * fix: update tests * chor: better message * docs: fix * fix: simplify message
1 parent a1f6d78 commit 91122e2

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ In the ryuk window you'll see containers/networks/volumes deleted after 10s
4949

5050
```log
5151
time=2024-09-30T19:42:30.000+01:00 level=INFO msg=starting connection_timeout=1m0s reconnection_timeout=10s request_timeout=10s shutdown_timeout=10m0s remove_retries=10 retry_offset=-1s port=8080 verbose=false
52-
time=2024-09-30T19:42:30.001+01:00 level=INFO msg=listening address=[::]:8080
52+
time=2024-09-30T19:42:30.001+01:00 level=INFO msg="Started"
5353
time=2024-09-30T19:42:30.001+01:00 level=INFO msg="client processing started"
5454
time=2024-09-30T19:42:38.002+01:00 level=INFO msg="client connected" address=127.0.0.1:56432 clients=1
5555
time=2024-09-30T19:42:38.002+01:00 level=INFO msg="adding filter" type=label values="[testing=true testing.sessionid=mysession]"

reaper.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ func newReaper(ctx context.Context, options ...reaperOption) (*reaper, error) {
140140
return nil, fmt.Errorf("listen: %w", err)
141141
}
142142

143-
r.logger.Info("listening", fieldAddress, r.listener.Addr().String())
143+
// This log message, in uppercase, is in use in different Testcontainers libraries,
144+
// so it is important to keep it as is to not break the current behavior of the libraries.
145+
r.logger.Info("Started", fieldAddress, r.listener.Addr().String())
144146

145147
return r, nil
146148
}

reaper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func testReaperRun(t *testing.T, tc *runTest) (string, error) {
280280

281281
// Standard checks for basic functionality.
282282
log := buf.String()
283-
require.Contains(t, log, "listening address="+addr)
283+
require.Contains(t, log, "Started")
284284
require.Contains(t, log, "client connected")
285285
require.Contains(t, log, "adding filter")
286286

0 commit comments

Comments
 (0)