From 08ca85122c12033cb0c341b94555afbb0ccdbc65 Mon Sep 17 00:00:00 2001 From: Samuel M Smith Date: Mon, 29 Sep 2014 12:07:46 -0600 Subject: [PATCH] Removed debug stuff --- salt/client/__init__.py | 2 +- salt/daemons/flo/core.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/salt/client/__init__.py b/salt/client/__init__.py index 3b6af697f5..89de3a67db 100644 --- a/salt/client/__init__.py +++ b/salt/client/__init__.py @@ -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', {}): diff --git a/salt/daemons/flo/core.py b/salt/daemons/flo/core.py index 158b6ed0ae..9702bcefb1 100644 --- a/salt/daemons/flo/core.py +++ b/salt/daemons/flo/core.py @@ -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