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

Removed debug stuff

Browse Source
This commit is contained in:
Samuel M Smith 2014-09-29 12:07:46 -06:00
parent ff0677c9a4
commit 08ca85122c
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/client/__init__.py
View File

@ -1217,7 +1217,7 @@ class LocalClient(object):
# Wait for the hosts to check in
while True:
raw = self.event.get_event(timeout)
if raw is None: # XXXX or time.time() > timeout_at:
if raw is None or time.time() > timeout_at:
# Timeout reached
break
if 'minions' in raw.get('data', {}):

3
salt/daemons/flo/core.py
View File

@ -781,9 +781,6 @@ class Router(ioflo.base.deeding.Deed):
log.error('Received invalid message: {0}'.format(msg))
return
if s_estate == 'router' or d_estate == 'router':
console.terse("Event estate for 'router' {0}.\n".format(msg))
if s_yard is None:
return # drop message