Salt api honors --log-file correctly#59881
Merged
Merged
Conversation
dwoz
force-pushed
the
issue/master/59880
branch
from
March 23, 2021 21:10
5673ebe to
971a30d
Compare
Make sure we verify the proper path when the --log-file cli options is passed via the commandline. Fixes saltstack#59880
dwoz
force-pushed
the
issue/master/59880
branch
from
March 24, 2021 00:15
971a30d to
314f4dd
Compare
dhiltonp
reviewed
Mar 24, 2021
dhiltonp
approved these changes
Mar 25, 2021
Ch3LL
approved these changes
Mar 25, 2021
twangboy
approved these changes
Mar 25, 2021
waynew
approved these changes
Mar 25, 2021
| try: | ||
| os.remove(logfile) | ||
| except OSError: | ||
| pass |
Contributor
There was a problem hiding this comment.
suggestion (non-blocking): Could add a contextmanager for this:
from contextlib import contextmanager
@contextmanager
def mktemp():
fname = tempfile.mktemp()
try:
yield fname
finally:
try:
os.remove(fname)
except OSError:
pass
Then it's just
with mktemp() as pidfile, mktemp() as logfile, patch.object(...):
and the rest of this boilerplate disappears.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Make sure we verify the proper path when the --log-file cli options is
passed via the commandline.
What issues does this PR fix or reference?
Fixes: #59880