Skip to content

Suppress SCP logs unless verbose explicitly enabled #158

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Suppress SCP logs unless verbose explicitly enabled #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/main/groovy/org/jenkinsci/plugins/sshsteps/SSHService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class SSHService implements Serializable {
private final boolean dryRunFlag
private final transient PrintStream logger
private final transient Service ssh
private boolean verbose = false

/**
* Constructor.
Expand Down Expand Up @@ -63,6 +64,10 @@ class SSHService implements Serializable {
}
}

void setVerbose(boolean verbose) {
this.verbose = verbose
}

private void validateRemote() {
new Common(logger).validateRemote(this.remote)
}
Expand Down Expand Up @@ -234,6 +239,14 @@ class SSHService implements Serializable {
def get(String from, String into, String filterBy, String filterRegex) {
registerLogHandler("Receiving a file/directory from $remote.name[$remote.host]: from: $from into: $into")
defineRemote(remote)

// Suppress SCP logs unless verbose explicitly enabled
if (!verbose && remote.fileTransfer?.equalsIgnoreCase('scp')) {
logger.println("Suppressing SCP transfer logs for $from (enable verbose: true for debugging)")
ssh.remotes."$remote.name".logging = LoggingMethod.none
ssh.remotes."$remote.name".interaction = {}
}

ssh.run {
session(ssh.remotes."$remote.name") {
if (filterBy && filterRegex)
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/jenkinsci/plugins/sshsteps/steps/GetStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ public class GetStep extends BasicSSHStep {
@DataBoundSetter
private boolean override = false;

@Setter
@DataBoundSetter
private boolean verbose = false;

@DataBoundConstructor
public GetStep(String from, String into) {
this.from = from;
Expand Down Expand Up @@ -118,6 +122,7 @@ public GetCallable(GetStep step, TaskListener listener, String into) {
@Override
public Object execute() {
final GetStep step = (GetStep) getStep();
getService().setVerbose(step.isVerbose());
return getService().get(step.getFrom(), into, step.getFilterBy(), step.getFilterRegex());
}
}
Expand Down
Loading