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.

Sign up for GitHub

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

Jump to bottom

Expand simple logging options #4832

Merged
merged 14 commits into from
Aug 28, 2016
Merged

Expand simple logging options #4832

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
794a959
Fix bot crash at start on permaban
Gobberwart Aug 27, 2016
41403d3
Merge branch 'PokemonGoF/dev' into dev
Gobberwart Aug 27, 2016
e7ec70e
Merge branch 'PokemonGoF/dev' into dev
Gobberwart Aug 27, 2016
8df9aa7
Merge branch 'PokemonGoF/dev' into dev
Gobberwart Aug 27, 2016
041e5ff
Expanded logging options
Gobberwart Aug 27, 2016
bb844b9
Added warning about deprecated logging_color arg
Gobberwart Aug 27, 2016
0cf9655
Display log message moved
Gobberwart Aug 27, 2016
f88997d
Remove milliseconds from datetime
Gobberwart Aug 27, 2016
79708f2
Merge branch 'PokemonGoF/dev' into dev
Gobberwart Aug 28, 2016
bbe0dfe
Merge branch 'Pokemongof/dev' into dev
Gobberwart Aug 28, 2016
c9164a7
Reversed condition order for clarity
Gobberwart Aug 28, 2016
1ccde94
Documented new log options
Gobberwart Aug 28, 2016
33e1095
Modified conditions again
Gobberwart Aug 28, 2016
0624ba9
Merge branch 'pokemongof/dev' into dev
Gobberwart Aug 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pokemongo_bot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,11 +763,15 @@ def _setup_logging(self):
if self.config.logging:
logging_format = '%(message)s'
logging_format_options = ''
if ('show_log_level' in self.config.logging and self.config.logging['show_log_level']) or 'show_log_level' not in self.config.logging:

if 'show_log_level' not in self.config.logging or \
('show_log_level' in self.config.logging and self.config.logging['show_log_level']):
Copy link
Contributor

@mjmadsen mjmadsen Aug 28, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I know I'm being a nazi here. The checks in the parenthesis will evaluate first, as parenthesis have a higher evaluation precedence, even though python evaluates left to right. "in" has a lower precedence than attributes and indices.

Please use the following (reduces the double "in" check too):
if ('show_log_level' not in self.config.logging) or self.config.logging['show_log_level']:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

logging_format = '[%(levelname)s] ' + logging_format
if ('show_process_name' in self.config.logging and self.config.logging['show_process_name']) or 'show_process_name' not in self.config.logging:
if 'show_process_name' not in self.config.logging or \
('show_process_name' in self.config.logging and self.config.logging['show_process_name']):
logging_format = '[%(name)10s] ' + logging_format
if ('show_datetime' in self.config.logging and self.config.logging['show_datetime']) or 'show_datetime' not in self.config.logging:
if 'show_datetime' not in self.config.logging or \
('show_datetime' in self.config.logging and self.config.logging['show_datetime']):
logging_format = '[%(asctime)s] ' + logging_format
logging_format_options = '%Y-%m-%d %H:%M:%S'

Expand Down