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 typo an recieved -> received

Browse source
This commit is contained in:
Benjamin Drung 2015-11-03 17:46:29 +01:00
parent 50eea287f3
commit c7e7884de2
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/topics/transports/zeromq.rst
View file

@ -23,4 +23,4 @@ Req Channel
The req channel is implemented using zeromq's req/rep sockets. These sockets
enforce a send/recv pattern, which forces salt to serialize messages through these
socket pairs. This means that although the interface is asynchronous on the minion
we cannot send a second message until we have recieved the reply of the first message.
we cannot send a second message until we have received the reply of the first message.

2
salt/minion.py
View file

@ -2148,7 +2148,7 @@ class MultiSyndic(MinionBase):
# Not a job return
return
if self.syndic_mode == 'cluster' and event['data'].get('master_id', 0) == self.opts.get('master_id', 1):
log.debug('Return recieved with matching master_id, not forwarding')
log.debug('Return received with matching master_id, not forwarding')
return
jdict = self.jids.setdefault(event['tag'], {})

2
salt/transport/client.py
View file

@ -172,7 +172,7 @@ class AsyncPubChannel(AsyncChannel):
def on_recv(self, callback):
'''
When jobs are recieved pass them (decoded) to callback
When jobs are received pass them (decoded) to callback
'''
raise NotImplementedError()

4
salt/transport/tcp.py
View file

@ -325,7 +325,7 @@ class TCPReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.tra
class SaltMessageServer(tornado.tcpserver.TCPServer, object):
'''
Raw TCP server which will recieve all of the TCP streams and re-assemble
Raw TCP server which will receive all of the TCP streams and re-assemble
messages that are sent through to us
'''
def __init__(self, message_handler, *args, **kwargs):
@ -515,7 +515,7 @@ class SaltMessageClient(object):
# TODO: return a message object which takes care of multiplexing?
def on_recv(self, callback):
'''
Register a callback for recieved messages (that we didn't initiate)
Register a callback for received messages (that we didn't initiate)
'''
if callback is None:
self._on_recv = callback

4
salt/transport/zeromq.py
View file

@ -361,7 +361,7 @@ class AsyncZeroMQPubChannel(salt.transport.mixins.auth.AESPubClientMixin, salt.t
# 2 includes a header which says who should do it
elif messages_len == 2:
if messages[0] not in ('broadcast', self.hexid):
log.debug('Publish recieved for not this minion: {0}'.format(messages[0]))
log.debug('Publish received for not this minion: {0}'.format(messages[0]))
raise tornado.gen.Return(None)
payload = self.serial.loads(messages[1])
else:
@ -383,7 +383,7 @@ class AsyncZeroMQPubChannel(salt.transport.mixins.auth.AESPubClientMixin, salt.t
def on_recv(self, callback):
'''
Register a callback for recieved messages (that we didn't initiate)
Register a callback for received messages (that we didn't initiate)
:param func callback: A function which should be called when data is received
'''