mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
3184168365
This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
141 lines
3.6 KiB
Python
141 lines
3.6 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
'''
|
|
Use this script to dump the event data out to the terminal. It needs to know
|
|
what the sock_dir is.
|
|
|
|
This script is a generic tool to test event output
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import, print_function
|
|
import optparse
|
|
import pprint
|
|
import time
|
|
import os
|
|
|
|
# Import Salt libs
|
|
import salt.utils.event
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
def parse():
|
|
'''
|
|
Parse the script command line inputs
|
|
'''
|
|
parser = optparse.OptionParser()
|
|
|
|
parser.add_option(
|
|
'-s',
|
|
'--sock-dir',
|
|
dest='sock_dir',
|
|
default='/var/run/salt',
|
|
help=('Statically define the directory holding the salt unix '
|
|
'sockets for communication')
|
|
)
|
|
parser.add_option(
|
|
'-n',
|
|
'--node',
|
|
dest='node',
|
|
default='master',
|
|
help=('State if this listener will attach to a master or a '
|
|
'minion daemon, pass "master" or "minion"')
|
|
)
|
|
parser.add_option(
|
|
'-f',
|
|
'--func_count',
|
|
default='',
|
|
help=('Return a count of the number of minions which have '
|
|
'replied to a job with a given func.')
|
|
)
|
|
parser.add_option(
|
|
'-i',
|
|
'--id',
|
|
default='',
|
|
help=('If connecting to a live master or minion, pass in the id')
|
|
)
|
|
parser.add_option(
|
|
'-t',
|
|
'--transport',
|
|
default='zeromq',
|
|
help=('Transport to use. (Default: \'zeromq\'')
|
|
)
|
|
|
|
options, args = parser.parse_args()
|
|
|
|
opts = {}
|
|
|
|
for k, v in six.iteritems(options.__dict__):
|
|
if v is not None:
|
|
opts[k] = v
|
|
|
|
opts['sock_dir'] = os.path.join(opts['sock_dir'], opts['node'])
|
|
|
|
if 'minion' in options.node:
|
|
if args:
|
|
opts['id'] = args[0]
|
|
return opts
|
|
if options.id:
|
|
opts['id'] = options.id
|
|
else:
|
|
opts['id'] = options.node
|
|
|
|
return opts
|
|
|
|
|
|
def check_access_and_print_warning(sock_dir):
|
|
'''
|
|
Check if this user is able to access the socket
|
|
directory and print a warning if not
|
|
'''
|
|
if (os.access(sock_dir, os.R_OK) and
|
|
os.access(sock_dir, os.W_OK) and
|
|
os.access(sock_dir, os.X_OK)):
|
|
return
|
|
else:
|
|
print('WARNING: Events will not be reported'
|
|
' (not able to access {0})'.format(sock_dir))
|
|
|
|
|
|
def listen(opts):
|
|
'''
|
|
Attach to the pub socket and grab messages
|
|
'''
|
|
event = salt.utils.event.get_event(
|
|
opts['node'],
|
|
sock_dir=opts['sock_dir'],
|
|
transport=opts['transport'],
|
|
opts=opts,
|
|
listen=True
|
|
)
|
|
check_access_and_print_warning(opts['sock_dir'])
|
|
print(event.puburi)
|
|
jid_counter = 0
|
|
found_minions = []
|
|
while True:
|
|
ret = event.get_event(full=True)
|
|
if ret is None:
|
|
continue
|
|
if opts['func_count']:
|
|
data = ret.get('data', False)
|
|
if data:
|
|
if 'id' in six.iterkeys(data) and data.get('id', False) not in found_minions:
|
|
if data['fun'] == opts['func_count']:
|
|
jid_counter += 1
|
|
found_minions.append(data['id'])
|
|
print('Reply received from [{0}]. Total replies now: [{1}].'.format(ret['data']['id'], jid_counter))
|
|
continue
|
|
else:
|
|
print('Event fired at {0}'.format(time.asctime()))
|
|
print('*' * 25)
|
|
print('Tag: {0}'.format(ret['tag']))
|
|
print('Data:')
|
|
pprint.pprint(ret['data'])
|
|
|
|
|
|
if __name__ == '__main__':
|
|
opts = parse()
|
|
listen(opts)
|