Skip to content
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

chore(expressions): Cleanup some noisy logs #1666

Merged
merged 1 commit into from
Oct 5, 2017
Merged

chore(expressions): Cleanup some noisy logs #1666

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
2 changes: 1 addition & 1 deletion ...n/groovy/com/netflix/spinnaker/orca/pipeline/expressions/ExpressionEvaluationSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public void appendAttempted(String expression) {
public String toString() {
String attempted = attempts.stream().collect(Collectors.joining(","));
String failed = expressionResult.keySet().stream().collect(Collectors.joining(","));
return String.format("Evaluated %d expression(s) - (%s), %d failed - (%s)",
return String.format("%d expression(s) - (%s), %d failed - (%s)",
getTotalEvaluated(),
attempted,
getFailureCount(),
Expand Down
1 change: 0 additions & 1 deletion ...rc/main/groovy/com/netflix/spinnaker/orca/pipeline/expressions/ExpressionTransform.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class ExpressionTransform {
} as T
} else if ((source instanceof String || source instanceof GString) && source.toString().contains(parserContext.getExpressionPrefix())) {
String literalExpression = source.toString()
log.debug("Processing expression {}", literalExpression)
literalExpression = includeExecutionObjectForStageFunctions(literalExpression)

T result
Expand Down
5 changes: 2 additions & 3 deletions ...src/main/groovy/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ class ContextParameterProcessor {
allowUnknownKeys,
)

if (summary.totalEvaluated > 0) {
log.debug(summary.toString())
if (summary.totalEvaluated > 0 && context.execution) {
log.info("Evaluated {} in execution {}", summary, context.execution.id)
}

if (summary.failureCount > 0) {
Expand All @@ -103,7 +103,6 @@ class ContextParameterProcessor {

Map<String, Object> process(Map<String, Object> parameters, Map<String, Object> context, boolean allowUnknownKeys) {
if (PipelineExpressionEvaluator.shouldUseV2Evaluator(parameters) || PipelineExpressionEvaluator.shouldUseV2Evaluator(context)) {
log.debug("Using V2 expression evaluation")
return processV2(parameters, context, allowUnknownKeys)
}

Expand Down