[develop] Only make a new log record if it's a dictionary.#53362
Merged
twangboy merged 3 commits intosaltstack:developfrom Jun 6, 2019
Merged
[develop] Only make a new log record if it's a dictionary.#53362twangboy merged 3 commits intosaltstack:developfrom
twangboy merged 3 commits intosaltstack:developfrom
Conversation
rares-pop
approved these changes
Jun 4, 2019
s0undt3ch
force-pushed
the
hotfix/fix-mp-logging-develop
branch
from
4f3f787 to
326c80d
Compare
twangboy
approved these changes
Jun 4, 2019
waynew
approved these changes
Jun 4, 2019
Akm0d
approved these changes
Jun 4, 2019
Contributor
Author
|
re-run all full |
This change prevents the following traceback on Ubuntu 18.04, at least:
```
19:58:13 Traceback (most recent call last):
19:58:13 File "tests/runtests.py", line 62, in <module>
19:58:13 from tests.integration import TestDaemon # pylint: disable=W0403
19:58:13 File "/tmp/kitchen/testing/tests/integration/__init__.py", line 36, in <module>
19:58:13 from tests.support.case import ShellTestCase
19:58:13 File "/tmp/kitchen/testing/tests/support/case.py", line 35, in <module>
19:58:13 from tests.support.mixins import AdaptedConfigurationTestCaseMixin, SaltClientTestCaseMixin
19:58:13 File "/tmp/kitchen/testing/tests/support/mixins.py", line 33, in <module>
19:58:13 import salt.config
19:58:13 File "/tmp/kitchen/testing/salt/config/__init__.py", line 27, in <module>
19:58:13 import salt.utils.network
19:58:13 File "/tmp/kitchen/testing/salt/utils/network.py", line 24, in <module>
19:58:13 import salt.utils.win_network
19:58:13 File "/tmp/kitchen/testing/salt/utils/win_network.py", line 42, in <module>
19:58:13 USE_WMI = StrictVersion(platform.version()) < StrictVersion('6.2')
19:58:13 File "/usr/lib/python2.7/distutils/version.py", line 40, in __init__
19:58:13 self.parse(vstring)
19:58:13 File "/tmp/kitchen/testing/salt/utils/versions.py", line 36, in parse
19:58:13 _StrictVersion.parse(self, vstring)
19:58:13 File "/usr/lib/python2.7/distutils/version.py", line 107, in parse
19:58:13 raise ValueError, "invalid version number '%s'" % vstring
19:58:13 ValueError: invalid version number 'saltstack#41-Ubuntu SMP Wed May 8 10:43:54 UTC 2019'
```
s0undt3ch
force-pushed
the
hotfix/fix-mp-logging-develop
branch
from
326c80d to
fded9da
Compare
s0undt3ch
force-pushed
the
hotfix/fix-mp-logging-develop
branch
from
5586899 to
769eb96
Compare
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.
What does this PR do?
Fix partial revert of 4eeedaa#diff-018cc41100faccc6dd6246e9e09e6c87 in 18de40c#diff-018cc41100faccc6dd6246e9e09e6c87