Fixes #5689: Rewrite system techniques to use rudder_common_report #566
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
| # check that techniques do not use reports: | ||
| ${REPOSITORY_PATH}/scripts/technique-files -l -f '*.cf' -f '*.st' "${REPOSITORY_PATH}" | grep -v initial-promises | egrep -v "techniques/system/common/1.0/(rudder_stdlib.st|update.st|promises.st|process_matching.st)|techniques/system/distributePolicy/1.0/rsyslogConf.st" | grep -v cfengine_stdlib | while read filename | ||
| do | ||
| if egrep '^[[:space:]]*reports:[[:space:]]*$' "${filename}" >/dev/null; then |
There was a problem hiding this comment.
I think this regex is a bit too strict. It won't match a line like this, for example:
reports: #Send messages about stuff
There was a problem hiding this comment.
Maybe just remove everything after "reports:" ?
There was a problem hiding this comment.
Yes that would be better
|
Aside from the comments above, this all looks good. However, this PR also needs rebasing. Can you address these and self-merge please? |
| "@@Common@@log_info@@&TRACKINGKEY&@@common@@EndRun@@${g.execRun}##${g.uuid}@#End execution with config [&RUDDER_NODE_CONFIG_ID&]"; | ||
| methods: | ||
| any:: | ||
| "any" usebundle => rudder_common_report("Common", "log_info", "&TRACKINGKEY&", "common", "EndRun", "End execution with config [&RUDDER_NODE_CONFIG_ID&]"); |
peckpeck
force-pushed
the
dev_5689/rewrite_system_techniques_to_use_rudder_common_report
branch
from
fce25e3
to
52d4fd2
Compare
peckpeck
added a commit
that referenced
this pull request
Nov 27, 2014
…ues_to_use_rudder_common_report Fixes #5689: Rewrite system techniques to use rudder_common_report
| @@ -198,8 +199,12 @@ bundle agent endExecution | |||
| start_run_message_sent:: | |||
| "@@Common@@log_info@@&TRACKINGKEY&@@common@@EndRun@@${g.execRun}##${g.uuid}@#End execution with config [&RUDDER_NODE_CONFIG_ID&]"; | |||
|
|
|||
| reports: | |||
| cfengine_3:: | |||
| "@@Common@@log_info@@&TRACKINGKEY&@@common@@EndRun@@${g.execRun}##${g.uuid}@#End execution with config [&RUDDER_NODE_CONFIG_ID&]"; | |||
There was a problem hiding this comment.
This is a duplicate, from just above, and should never have been committed!
peckpeck
deleted the
dev_5689/rewrite_system_techniques_to_use_rudder_common_report
branch
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.
Replaces #546