allow dict_merge to throw an error on rollbar.init + fix logging init #339
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
|
@terencehonles This looks good. Can you rebase to master? Maybe that's enough to get the build green. |
- ``dict_merge`` is used in ``rollbar.init`` which potentially allows
broken config to silently misconfigure the rollbar settings because it
is not strictly copying the config passed in. This PR changes
``dict_merge`` to allow a strict mode so ``rollbar.init`` will throw
an error instead of misconfiguring rollbar, and when ``dict_merge`` is
used to send data to rollbar it uses the unstrict mode to not break at
"runtime".
- When initializing rollbar via the ``RollbarHandler``, the logging
config that is passed in is wrapped by a
``Converting{Dict,List,Tuple}`` which breaks ``copy.deepcopy``. This
PR unwraps the converter container types to their base types so that
the subsequent call to ``dict_merge`` does not break or hide this
error.
terencehonles
force-pushed
the
fix-dict_merge-for-rollbar.init-and-unwrap-logging-wrappers
branch
from
05403fb
to
57d9ccc
Compare
It looks like it was already on top of master, but I amend the commit to change the SHA and force a rebuild. |
|
#335 is failing CI in the same place. Later PRs are not. While Github is doing a smart diff with master for the PR, I'm not sure that's what Travis is picking up. |
@waltjones #349 will fix the test case, but I opened it as its own PR so it could be adjusted if needed. |
waltjones
approved these changes
Aug 17, 2020
terencehonles
deleted the
fix-dict_merge-for-rollbar.init-and-unwrap-logging-wrappers
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.
dict_mergeis used inrollbar.initwhich potentially allows broken config to silently misconfigure the rollbar settings because it is not strictly copying the config passed in. This PR changesdict_mergeto allow a strict mode sorollbar.initwill throw an error instead of misconfiguring rollbar, and whendict_mergeis used to send data to rollbar it uses the unstrict mode to not break at "runtime".When initializing rollbar via the
RollbarHandler, the logging config that is passed in is wrapped by aConverting{Dict,List,Tuple}which breakscopy.deepcopy. This PR unwraps the converter container types to their base types so that the subsequent call todict_mergedoes not break or hide this error.