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

Fully revert 962b11687

Browse source
This commit is contained in:
Pedro Algarvio 2019-06-04 07:15:16 +01:00
parent ce5d79adce
commit d70d61fc8b
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/log/setup.py
View file

@ -1118,13 +1118,12 @@ def __process_multiprocessing_logging_queue(opts, queue):
setup_extended_logging(opts)
while True:
try:
record_dict = queue.get()
if record_dict is None:
record = queue.get()
if record is None:
# A sentinel to stop processing the queue
break
# Just log everything, filtering will happen on the main process
# logging handlers
record = logging.makeLogRecord(record_dict)
logger = logging.getLogger(record.name)
logger.handle(record)
except (EOFError, KeyboardInterrupt, SystemExit):