mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
3273bbdab7
Conflicts: - doc/ref/configuration/master.rst - doc/ref/modules/all/index.rst - doc/topics/grains/index.rst - doc/topics/releases/2016.3.4.rst - doc/topics/spm/spm_formula.rst - doc/topics/tutorials/cron.rst - doc/topics/tutorials/index.rst - doc/topics/tutorials/stormpath.rst - salt/engines/slack.py - salt/log/handlers/fluent_mod.py - salt/modules/cyg.py - salt/modules/junos.py - salt/modules/namecheap_dns.py - salt/modules/namecheap_domains.py - salt/modules/namecheap_ns.py - salt/modules/namecheap_ssl.py - salt/modules/namecheap_users.py - salt/modules/reg.py - salt/modules/tomcat.py - salt/modules/vault.py - salt/modules/win_file.py - salt/modules/zpool.py - salt/output/highstate.py - salt/renderers/pass.py - salt/runners/cache.py - salt/states/boto_apigateway.py - salt/states/boto_iam.py - salt/states/boto_route53.py - salt/states/msteams.py - salt/states/reg.py - salt/states/win_iis.py - tests/integration/modules/test_cmdmod.py - tests/integration/states/test_user.py - tests/support/helpers.py - tests/unit/cloud/clouds/test_openstack.py - tests/unit/fileserver/test_gitfs.py - tests/unit/modules/test_junos.py - tests/unit/pillar/test_git.py - tests/unit/states/test_win_path.py - tests/unit/test_pillar.py - tests/unit/utils/test_format_call.py - tests/unit/utils/test_utils.py - tests/unit/utils/test_warnings.py
107 lines
3.1 KiB
Python
107 lines
3.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: Pedro Algarvio (pedro@algarvio.me)
|
|
:copyright: Copyright 2016 by the SaltStack Team, see AUTHORS for more details.
|
|
:license: Apache 2.0, see LICENSE for more details.
|
|
|
|
|
|
pytestsalt.salt.log_handlers.pytest_log_handler
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Salt External Logging Handler
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import errno
|
|
import socket
|
|
import logging
|
|
import threading
|
|
from multiprocessing import Queue
|
|
|
|
# Import 3rd-party libs
|
|
import msgpack
|
|
|
|
# Import Salt libs
|
|
from salt.ext import six
|
|
import salt.log.setup
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
__virtualname__ = 'runtests_log_handler'
|
|
|
|
|
|
def __virtual__():
|
|
if 'runtests_log_port' not in __opts__:
|
|
return False, "'runtests_log_port' not in options"
|
|
if six.PY3:
|
|
return False, "runtests external logging handler is temporarily disabled for Python 3 tests"
|
|
return True
|
|
|
|
|
|
def setup_handlers():
|
|
port = __opts__['runtests_log_port']
|
|
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
|
try:
|
|
sock.connect(('localhost', port))
|
|
except socket.error as exc:
|
|
if exc.errno == errno.ECONNREFUSED:
|
|
log.warning('Failed to connect to log server')
|
|
return
|
|
finally:
|
|
try:
|
|
sock.shutdown(socket.SHUT_RDWR)
|
|
except OSError:
|
|
pass
|
|
sock.close()
|
|
|
|
queue = Queue()
|
|
handler = salt.log.setup.QueueHandler(queue)
|
|
handler.setLevel(1)
|
|
process_queue_thread = threading.Thread(target=process_queue, args=(port, queue))
|
|
process_queue_thread.daemon = True
|
|
process_queue_thread.start()
|
|
return handler
|
|
|
|
|
|
def process_queue(port, queue):
|
|
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
|
try:
|
|
sock.connect(('localhost', port))
|
|
except socket.error as exc:
|
|
if exc.errno == errno.ECONNREFUSED:
|
|
sock.shutdown(socket.SHUT_RDWR)
|
|
sock.close()
|
|
log.warning('Failed to connect to log server')
|
|
return
|
|
|
|
while True:
|
|
try:
|
|
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
|
|
sock.sendall(msgpack.dumps(record.__dict__, encoding='utf-8'))
|
|
except (IOError, EOFError, KeyboardInterrupt, SystemExit):
|
|
sock.shutdown(socket.SHUT_RDWR)
|
|
sock.close()
|
|
break
|
|
except socket.error as exc:
|
|
if exc.errno == errno.EPIPE:
|
|
# Broken pipe
|
|
sock.shutdown(socket.SHUT_RDWR)
|
|
sock.close()
|
|
break
|
|
log.exception(exc)
|
|
except Exception as exc: # pylint: disable=broad-except
|
|
log.warning(
|
|
'An exception occurred in the pytest salt logging '
|
|
'queue thread: %s',
|
|
exc,
|
|
exc_info_on_loglevel=logging.DEBUG
|
|
)
|