Fixes #13632: Allow to report on same reporting parameters #840
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VinceMacBuche
force-pushed
the
bug_13632/allow_to_report_on_same_reporting_parameters
branch
from
6c270ea
to
8560cd9
Compare
|
Commit modified |
VinceMacBuche
force-pushed
the
bug_13632/allow_to_report_on_same_reporting_parameters
branch
from
8560cd9
to
975b36c
Compare
|
Commit modified |
VinceMacBuche
commented
Oct 10, 2018
| @@ -203,7 +203,7 @@ bundle agent _log_rudder_v2(expected_reports_source, message, class_prefix, args | |||
|
|
|||
| methods: | |||
| report_data_found:: | |||
| "any" usebundle => _rudder_common_reports_generic("${report_data[1]}", "${class_prefix}", "${report_data[3]}", "${promisers}", "${args_line1}", "${message_line1}"), | |||
| "any" usebundle => _rudder_common_reports_generic("${report_data[1]}", "${class_prefix}", "${report_data[3]}", "${promisers}", "${args_line1}", "${message_line1}",""), | |||
There was a problem hiding this comment.
Maybe there should be a value here, i dunno ... but since logger_v2 is almost never called ...
ncharles
reviewed
Oct 10, 2018
| ifvarclass => "${class_prefix}_noop.!${class_prefix}_kept.!${class_prefix}_repaired.!${class_prefix}_error"; | ||
|
|
||
| "success" | ||
| usebundle => _rudder_common_report("${technique_name}", "result_success", "${identifier}", "${component_name}", "${component_key}", "${message_prefix} was correct"), | ||
| "success-${join}" |
There was a problem hiding this comment.
you don't need to change this promiser
| @@ -277,7 +277,8 @@ bundle agent _rudder_common_report(technique_name, status, identifier, component | |||
|
|
|||
| reports: | |||
| !changes_only|send_reports:: | |||
| "@@${technique_name}@@${status}@@${identifier}@@${component_name}@@${component_key}@@${g.execRun}##${g.uuid}@#${message}"; | |||
| "@@${technique_name}@@${status}@@${identifier}@@${component_name}@@${component_key}@@${g.execRun}##${g.uuid}@#${message}" | |||
| comment => "${join}"; | |||
There was a problem hiding this comment.
Can you improve the text by saying: "Method call with parameters ${join}", or something equivalent ?
VinceMacBuche
force-pushed
the
bug_13632/allow_to_report_on_same_reporting_parameters
branch
from
975b36c
to
6586811
Compare
|
Commit modified |
ncharles
reviewed
Oct 10, 2018
| @@ -36,5 +36,5 @@ bundle agent file_ensure_lines_present(file, lines) | |||
| "enforce lines content" usebundle => file_enforce_content("${file}", "${lines}", "false"); | |||
| "new result classes" usebundle => _classes_copy("${class_prefix}_enforce_lines_content", "${class_prefix}"); | |||
|
|
|||
| "report" usebundle => _log("Insert content ${lines} into ${file}", "", "${class_prefix}", @{args}); | |||
| "report" usebundle => _log("Insert content into ${file}", "", "${class_prefix}", @{args}); | |||
There was a problem hiding this comment.
you should also "joined" string => join(",",args); here
|
Commit modified |
VinceMacBuche
force-pushed
the
bug_13632/allow_to_report_on_same_reporting_parameters
branch
from
6586811
to
27c57cd
Compare
ncharles
approved these changes
Oct 11, 2018
|
This PR is not mergeable to upper versions. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/13632