Skip to content

Commit 5d5cb2d

Browse files
mauschHofmeisterAn
andauthored
fix: Prevent invalid negative timestamps getting container logs (#1038)
Co-authored-by: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com>
1 parent 082eea4 commit 5d5cb2d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Testcontainers/Clients/DockerContainerOperations.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public async Task<long> GetExitCodeAsync(string id, CancellationToken ct = defau
6969
{
7070
ShowStdout = true,
7171
ShowStderr = true,
72-
Since = since.TotalSeconds.ToString("0", CultureInfo.InvariantCulture),
73-
Until = until.TotalSeconds.ToString("0", CultureInfo.InvariantCulture),
72+
Since = Math.Max(0, since.TotalSeconds).ToString("0", CultureInfo.InvariantCulture),
73+
Until = Math.Max(0, until.TotalSeconds).ToString("0", CultureInfo.InvariantCulture),
7474
Timestamps = timestampsEnabled,
7575
};
7676

src/Testcontainers/Clients/TestcontainersClient.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ public Task<long> GetContainerExitCodeAsync(string id, CancellationToken ct = de
106106

107107
if (default(DateTime).Equals(since))
108108
{
109-
since = DateTime.MinValue;
109+
since = unixEpoch;
110110
}
111111

112112
if (default(DateTime).Equals(until))
113113
{
114-
until = DateTime.MaxValue;
114+
until = unixEpoch;
115115
}
116116

117117
return Container.GetLogsAsync(id, since.ToUniversalTime().Subtract(unixEpoch), until.ToUniversalTime().Subtract(unixEpoch), timestampsEnabled, ct);

0 commit comments

Comments
 (0)