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

Removed left over break and corrected grammar.

Browse Source
This commit is contained in:
Pedro Algarvio 2012-12-27 15:52:15 +00:00
parent f702989091
commit 1ee445dcd0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/minion.py
View File

@ -622,7 +622,9 @@ class Minion(object):
epub_uri = 'ipc://{0}'.format(epub_sock_path)
epull_uri = 'ipc://{0}'.format(epull_sock_path)
for uri in (epub_uri, epull_uri):
break
if uri.startswith('tcp://'):
# This check only applies to IPC sockets
continue
# The socket path is limited to 107 characters on Solaris and
# Linux, and 103 characters on BSD-based systems.
# Let's fail at the lower level so no system checks are
@ -632,7 +634,7 @@ class Minion(object):
'The socket path length is more that what ZMQ allows. '
'The length of {0!r} is more than 103 characters. '
'Either try to reduce the length of this setting\'s '
'path or switch to TCP; On the config file set '
'path or switch to TCP; In the configuration file set '
'"ipc_mode: tcp"'.format(
uri
)

2
salt/utils/event.py
View File

@ -91,7 +91,7 @@ class SaltEvent(object):
'The socket path length is more that what ZMQ allows. '
'The length of {0!r} is more than 103 characters. '
'Either try to reduce the length of this setting\'s '
'path or switch to TCP; On the config file set '
'path or switch to TCP; In the configuration file set '
'"ipc_mode: tcp"'.format(
uri
)