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

Fix log error/info/warning and exception messages

Browse source
This commit is contained in:
Bo Maryniuk 2018-07-23 12:25:07 +02:00
parent 6e77aff69a
commit b9718d3a09
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cloud/clouds/msazure.py
View file

@ -888,7 +888,7 @@ def _wait_for_async(conn, request_id):
while result.status == 'InProgress':
count = count + 1
if count > 120:
raise ValueError('Timed out waiting for async operation to complete.')
raise ValueError('Timed out waiting for asynchronous operation to complete.')
time.sleep(5)
result = conn.get_operation_status(request_id)

2
salt/cloud/clouds/profitbricks.py
View file

@ -1098,7 +1098,7 @@ def _wait_for_completion(conn, promise, wait_timeout, msg):
)
raise Exception(
'Timed out waiting for async operation {0} "{1}" to complete.'.format(
'Timed out waiting for asynchronous operation {0} "{1}" to complete.'.format(
msg, six.text_type(promise['requestId'])
)
)

2
salt/engines/slack.py
View file

@ -792,7 +792,7 @@ class SlackClient(object):
:param interval: time to wait between ending a loop and beginning the next
'''
log.debug('Going to run a command async')
log.debug('Going to run a command asynchronous')
runner_functions = sorted(salt.runner.Runner(__opts__).functions)
# Parse args and kwargs
cmd = msg['cmdline'][0]

4
salt/minion.py
View file

@ -926,7 +926,7 @@ class MinionManager(MinionBase):
install_zmq()
self.io_loop = ZMQDefaultLoop.current()
self.process_manager = ProcessManager(name='MultiMinionProcessManager')
self.io_loop.spawn_callback(self.process_manager.run, async=True)
self.io_loop.spawn_callback(self.process_manager.run, **{'async': True}) # Tornado backward compat
def __del__(self):
self.destroy()
@ -1123,7 +1123,7 @@ class Minion(MinionBase):
time.sleep(sleep_time)
self.process_manager = ProcessManager(name='MinionProcessManager')
self.io_loop.spawn_callback(self.process_manager.run, async=True)
self.io_loop.spawn_callback(self.process_manager.run, **{'async': True})
# We don't have the proxy setup yet, so we can't start engines
# Engines need to be able to access __proxy__
if not salt.utils.platform.is_proxy():

2
salt/modules/cassandra_cql.py
View file

@ -128,7 +128,7 @@ def __virtual__():
def _async_log_errors(errors):
log.error('Cassandra_cql async call returned: %s', errors)
log.error('Cassandra_cql asynchronous call returned: %s', errors)
def _load_properties(property_name, config_option, set_default=False, default=None):

2
salt/runner.py
View file

@ -246,7 +246,7 @@ class Runner(RunnerClient):
pub=async_pub)
# by default: info will be not enougth to be printed out !
log.warning(
'Running in async mode. Results of this execution may '
'Running in asynchronous mode. Results of this execution may '
'be collected by attaching to the master event bus or '
'by examing the master job cache, if configured. '
'This execution is running under tag %s', async_pub['tag']