saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix improper use of yield in generator

Browse source 
The log4mongo setup_handler was using yield incorrectly.  Yield simply
pauses execution at the point of the yield, and then the next call
continues from the point of the yield.

By yielding false at the beginning of the generator and not checking the
__opts__ for the name ( again ), it was simply continuing the execution,
even if log4mongo was not configured.
This commit is contained in:
Steve Hajducko 2016-01-28 16:54:53 -08:00
parent 36db0f99ed
commit d501f1cc03
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
salt/log/handlers/log4mongo_mod.py
View file

@ -69,33 +69,32 @@ class FormatterWithHost(logging.Formatter, NewStyleClassMixIn):
def setup_handlers():
handler_id = 'log4mongo_handler'
if handler_id not in __opts__:
yield False
if handler_id in __opts__:
config_fields = {
'host': 'host',
'port': 'port',
'database_name': 'database_name',
'collection': 'collection',
'username': 'username',
'password': 'password',
'write_concern': 'w'
}
config_fields = {
'host': 'host',
'port': 'port',
'database_name': 'database_name',
'collection': 'collection',
'username': 'username',
'password': 'password',
'write_concern': 'w'
}
config_opts = {}
for config_opt, arg_name in config_fields.iteritems():
config_opts[arg_name] = __opts__[handler_id].get(config_opt)
config_opts = {}
for config_opt, arg_name in config_fields.iteritems():
config_opts[arg_name] = __opts__[handler_id].get(config_opt)
config_opts['level'] = LOG_LEVELS[
__opts__[handler_id].get(
'log_level',
__opts__.get('log_level', 'error')
)
]
config_opts['level'] = LOG_LEVELS[
__opts__[handler_id].get(
'log_level',
__opts__.get('log_level', 'error')
handler = MongoHandler(
formatter=FormatterWithHost(),
**config_opts
)
]
handler = MongoHandler(
formatter=FormatterWithHost(),
**config_opts
)
yield handler
yield handler
else:
yield False