-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Expand simple logging options #4832
Merged
Merged
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
794a959
Fix bot crash at start on permaban
Gobberwart 41403d3
Merge branch 'PokemonGoF/dev' into dev
Gobberwart e7ec70e
Merge branch 'PokemonGoF/dev' into dev
Gobberwart 8df9aa7
Merge branch 'PokemonGoF/dev' into dev
Gobberwart 041e5ff
Expanded logging options
Gobberwart bb844b9
Added warning about deprecated logging_color arg
Gobberwart 0cf9655
Display log message moved
Gobberwart f88997d
Remove milliseconds from datetime
Gobberwart 79708f2
Merge branch 'PokemonGoF/dev' into dev
Gobberwart bbe0dfe
Merge branch 'Pokemongof/dev' into dev
Gobberwart c9164a7
Reversed condition order for clarity
Gobberwart 1ccde94
Documented new log options
Gobberwart 33e1095
Modified conditions again
Gobberwart 0624ba9
Merge branch 'pokemongof/dev' into dev
Gobberwart File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we check if 'show_log_level' is not present, and if so, set it to true. Then a second if for the actual format change?
Same with those below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's what it does. First check is for "is in config and set true", second check is OR "not in config". If either condition is matched, it will be enabled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I get that. I'm a bit curious on the evaluation order in python as the "and self.config.logging['show_log_level'] might happen before we check if it is in self.config.logging.
Suppose we could put 'show_log_level' in self.config.logging inside of more parenthesis to make sure it happens first. If you could try to run it (as is) without them being defined, to see if there is an error. I would do this quick, but I'm at work (and working really hard :P).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It shouldn't happen... the first condition (with the end) will fail on the first check and not even bother to perform the second.
For the sake of clarity, I'll reverse it :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's subtle.
('show_log_level' in self.config.logging and self.config.logging['show_log_level'])
Might evaluate self.config.logging['show_log_level'] first, which would throw an error if it doesn't exist.
How about this:
if ('show_log_level' not in self.config.logging) or self.config.logging['show_log_level']):
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mjmadsen How's this (in the latest commit for all three items)...?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hahaha, I'm a derp. If the ('show_log_level' in self.config.logging) fails, I really don't need to check it again, do I?
2 minutes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, done and tested. All lines now follow the format you suggested as follows:
I knew something wasn't quite right in there.