Skip to content

add until param with LogContainerCmd #1734

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.

Sign up for GitHub

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

Merged
bsideup merged 2 commits into from
Dec 17, 2021
Merged

add until param with LogContainerCmd #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ec0d5
add `until` param with LogContainerCmd
Nov 10, 2021
d1d83e4
Update LogContainerCmdIT.java
bsideup Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* @param since
* - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
* 0 (unfiltered)
* @param until
* - Only return logs before this time, as a UNIX timestamp. Default: 0
*/
public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {

Expand All @@ -49,6 +51,9 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
@CheckForNull
Integer getSince();

@CheckForNull
Integer getUntil();

LogContainerCmd withContainerId(@Nonnull String containerId);

/**
Expand All @@ -69,6 +74,8 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>

LogContainerCmd withSince(Integer since);

LogContainerCmd withUntil(Integer until);

/**
* @throws com.github.dockerjava.api.NotFoundException
* No such container
Expand Down
15 changes: 14 additions & 1 deletion docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@
* @param since
* - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
* 0 (unfiltered)
* @param until
* - Only return logs before this time, as a UNIX timestamp. Default: 0
*/
public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {

private String containerId;

private Boolean followStream, timestamps, stdout, stderr;

private Integer tail, since;
private Integer tail, since, until;

public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
super(exec);
Expand Down Expand Up @@ -73,6 +75,11 @@ public Integer getSince() {
return since;
}

@Override
public Integer getUntil() {
return until;
}

@Override
public LogContainerCmd withContainerId(String containerId) {
checkNotNull(containerId, "containerId was not specified");
Expand Down Expand Up @@ -122,6 +129,12 @@ public LogContainerCmd withSince(Integer since) {
return this;
}

@Override
public LogContainerCmd withUntil(Integer until) {
this.until = until;
return this;
}

@Override
public String toString() {
return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
Expand Down
4 changes: 4 additions & 0 deletions docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ protected Void execute0(LogContainerCmd command, ResultCallback<Frame> resultCal
webTarget = webTarget.queryParam("since", command.getSince());
}

if (command.getUntil() != null) {
webTarget = webTarget.queryParam("until", command.getUntil());
}

webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled());
webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
Expand Down
1 change: 1 addition & 0 deletions docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ public void asyncLogContainerWithSince() throws Exception {
.withStdErr(true)
.withStdOut(true)
.withSince(timestamp)
.withUntil(timestamp + 1000)
.exec(loggingCallback);

loggingCallback.awaitCompletion();
Expand Down