Fixes #9021: Patch the agent to output needed data for jinja2 templating #1081
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
|
Still testing, please wait before merging. |
jooooooon
reviewed
Sep 22, 2016
| FNCALL_OPTION_NONE, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), | ||
| FnCallTypeNew("datastate", CF_DATA_TYPE_CONTAINER, DATASTATE_ARGS, &FnCallDatastate, "Construct a container of the variable and class state", | ||
| FNCALL_OPTION_NONE, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), | ||
| + FnCallTypeNew("dumpdatastate", CF_DATA_TYPE_CONTEXT, FILESTAT_ARGS, &FnCallDumpDatastate, "Dump the current datatstae() into the given file", |
There was a problem hiding this comment.
There's a typo here: datastate()*
| + FILE *fout; | ||
| + if ((fout = fopen(path, "w")) == NULL) | ||
| + { | ||
| + Log(LOG_LEVEL_ERR, "Cannot open the destination file '%s'. (fopen: %s)", |
There was a problem hiding this comment.
It's useful in error messages to know where this error is coming from. Could you prefix it with "dumpdatastate(): " maybe?
| + ARG_UNUSED const FnCall *fp, | ||
| + ARG_UNUSED const Rlist *args) | ||
| +{ | ||
| + char *path = RlistScalarValue(args); |
There was a problem hiding this comment.
Doesn't this need free-ing at the end of the function?
There was a problem hiding this comment.
No, the data is in args, which is freed by FnCallDestroy in a parent function.
| + JsonElement *state = DefaultTemplateData(ctx, NULL); | ||
| + JsonWrite(writer, state, 0); | ||
| + | ||
| + WriterClose(writer); |
There was a problem hiding this comment.
Does this also fclose() the FILE handle above? If not we should close it.
|
Commit modified |
amousset
force-pushed
the
bug_9021/patch_the_agent_to_output_needed_data_for_jinja2_templating
branch
from
3ef5527
to
49fb019
Compare
|
Looks good to me |
|
OK, merging this PR |
This pull request was closed.
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/9021