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.

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

Fix applying of attributes for returner rawfile_json #50087

Merged
merged 3 commits into from Nov 6, 2018

Conversation

@rbthomp
Copy link
Contributor

commented Oct 16, 2018

Arguments are not getting applied to the rawfile_json returner. For example if you specify an alternate filename for the output the default "/var/log/salt/events" is always used. Passing the ret to `_get_options(ret) resolve this.

Arguments are not getting applied to the rawfile_json returner. For example if you specify an alternate filename for the output the default "/var/log/salt/events" is always used. Passing the `ret` to `_get_options(ret) resolve this.
@max-arnold

This comment has been minimized.

Copy link
Contributor

commented Oct 17, 2018

There is a second occurrence of the _get_options({}) here

opts = _get_options({}) # Pass in empty ret, since this is a list of events

I'm not sure if it also needs to be fixed.

@fdamstra Could you please take a look?

@rbthomp

This comment has been minimized.

Copy link
Contributor Author

commented Oct 17, 2018

I wasn't sure that the event_return needed it as the event_return is set in the master config and isn't called by the minion. I couldn't think of a way that filename or other args could be passed to _get_options() for the event_returner other then __opts__ from the master config.

Is my logic on this correct?

rallytime added 2 commits Oct 26, 2018
@cachedout cachedout merged commit 5cad193 into saltstack:develop Nov 6, 2018
9 of 11 checks passed
9 of 11 checks passed
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
codeclimate All good!
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
dwoz added a commit that referenced this pull request Apr 25, 2019
Backport #50087 into 2019.2.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.