valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

We need to use a multiprocessing Queue

Browse Source
This commit is contained in:
Pedro Algarvio 2016-05-23 13:53:34 +01:00
parent d2b696ba8b
commit 17798f7b69
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/files/log_handlers/runtests_log_handler.py
View File

@ -14,10 +14,17 @@
# Import python libs
from __future__ import absolute_import
import socket
import logging
import threading
from multiprocessing import Queue
# Import 3rd-party libs
import msgpack
# Import Salt libs
import salt.log.setup
from salt.ext.six.moves.queue import Queue
log = logging.getLogger(__name__)
__virtualname__ = 'runtests_log_handler'
@ -47,6 +54,7 @@ def process_queue(port, queue):
sock.connect(('localhost', port))
except socket.error as exc:
if exc.errno == errno.ECONNREFUSED:
log.warning('Failed to connect to log server')
return
while True:
try:
@ -57,7 +65,7 @@ def process_queue(port, queue):
# Just log everything, filtering will happen on the main process
# logging handlers
sock.sendall(msgpack.dumps(record.__dict__, encoding='utf-8'))
except (EOFError, KeyboardInterrupt, SystemExit):
except (IOError, EOFError, KeyboardInterrupt, SystemExit):
break
except socket.error as exc:
if exc.errno == errno.EPIPE: