Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ public class Arguments {
description = "Output JSON report to stdout instead of writing to files (conflicts with -o)")
private boolean stdoutOutput = false;

@Parameter(
names = {"-q", "--quiet"},
description = "Silences non-critical log messages when running validator")
private boolean quiet = false;

ValidationRunnerConfig toConfig() throws URISyntaxException {
ValidationRunnerConfig.Builder builder = ValidationRunnerConfig.builder();
if (input != null) {
Expand Down Expand Up @@ -149,6 +154,7 @@ ValidationRunnerConfig toConfig() throws URISyntaxException {
builder.setPrettyJson(pretty);
builder.setSkipValidatorUpdate(skipValidatorUpdate);
builder.setStdoutOutput(stdoutOutput);
builder.setQuietLogs(quiet);
return builder.build();
}

Expand All @@ -172,6 +178,10 @@ public boolean getStdoutOutput() {
return stdoutOutput;
}

public boolean getQuietLogs() {
return quiet;
}

/**
* @return true if CLI parameter combination is legal, otherwise return false
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,10 @@ public Status run(ValidationRunnerConfig config) {
}
GtfsFeedLoader feedLoader = new GtfsFeedLoader(ClassGraphDiscovery.discoverTables());

if (!config.quietLogs()) {
logger.atInfo().log("validation config:\n%s", config);
logger.atInfo().log("validators:\n%s", validatorLoader.listValidators());
}

final long startNanos = System.nanoTime();
// Input.
Expand Down Expand Up @@ -248,8 +250,10 @@ public static void printSummary(
logger.atWarning().log(b.toString());
}

if (!config.quietLogs()) {
logger.atInfo().log("Validation took %.3f seconds%n", feedMetadata.validationTimeSeconds);
logger.atInfo().log(feedContainer.tableTotalsText());
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ public Path systemErrorsReportPath() {
// If true, output JSON report to stdout instead of writing to files
public abstract boolean stdoutOutput();

// If true, the validation runner will not print informational logging messages
public abstract boolean quietLogs();

public static Builder builder() {
// Set reasonable defaults where appropriate.
return new AutoValue_ValidationRunnerConfig.Builder()
Expand All @@ -80,7 +83,8 @@ public static Builder builder() {
.setCountryCode(CountryCode.forStringOrUnknown(CountryCode.ZZ))
.setDateForValidation(LocalDate.now())
.setSkipValidatorUpdate(false)
.setStdoutOutput(false);
.setStdoutOutput(false)
.setQuietLogs(false);
}

@AutoValue.Builder
Expand Down Expand Up @@ -109,6 +113,8 @@ public abstract static class Builder {

public abstract Builder setStdoutOutput(boolean stdoutOutput);

public abstract Builder setQuietLogs(boolean quietLogs);

public abstract ValidationRunnerConfig build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ private static ValidationRunnerConfig generateValidationRunnerConfig() throws Ex
builder.setValidationReportFileName("some_report_filename");
builder.setDateForValidation(LocalDate.parse("2020-01-02"));
builder.setStdoutOutput(false);
builder.setQuietLogs(false);

return builder.build();
}
Expand Down
Loading