valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Even more debug logging for manage runner tests

Browse Source 
This will show whether or not the test.ping was actually received by the
minion, and whether or not the minion attempted to send the return back
to the master.
This commit is contained in:
Erik Johnson 2017-06-06 12:10:22 -05:00
parent 0685d72e3a
commit 8d85d7a898
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/minion.py
View File

@ -1547,6 +1547,7 @@ class Minion(MinionBase):
else: else:
data['ret'] = opts['return'] data['ret'] = opts['return']
log.debug('minion return: %s', ret)
# TODO: make a list? Seems odd to split it this late :/ # TODO: make a list? Seems odd to split it this late :/
if data['ret'] and isinstance(data['ret'], six.string_types): if data['ret'] and isinstance(data['ret'], six.string_types):
if 'ret_config' in data: if 'ret_config' in data:

4
salt/modules/test.py
View File

@ -5,6 +5,7 @@ Module for running arbitrary tests
from __future__ import absolute_import from __future__ import absolute_import
# Import Python libs # Import Python libs
import logging
import os import os
import sys import sys
import time import time
@ -27,6 +28,8 @@ __func_alias__ = {
'false_': 'false' 'false_': 'false'
} }
log = logging.getLogger(__name__)
@depends('non_existantmodulename') @depends('non_existantmodulename')
def missing_func(): def missing_func():
@ -112,6 +115,7 @@ def ping():
''' '''
if not salt.utils.is_proxy(): if not salt.utils.is_proxy():
log.debug('test.ping received for minion \'%s\'', __opts__.get('id'))
return True return True
else: else:
ping_cmd = __opts__['proxy']['proxytype'] + '.ping' ping_cmd = __opts__['proxy']['proxytype'] + '.ping'