From 9fa2fb461359a573dd1dafe5d54e7763bcb73a7f Mon Sep 17 00:00:00 2001 From: Samuel M Smith Date: Thu, 9 Oct 2014 12:26:56 -0600 Subject: [PATCH] Changed how timeout works in RAETChannel --- salt/transport/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/transport/__init__.py b/salt/transport/__init__.py index 4058327046..144ebc3a09 100644 --- a/salt/transport/__init__.py +++ b/salt/transport/__init__.py @@ -165,8 +165,9 @@ class RAETChannel(Channel): break if time.time() - start > timeout: if tried >= tries: - raise ValueError - self.stack.transmit(msg, self.stack.nameRemotes['manor'].uid) + raise ValueError("Message send timed out after '{0} * {1}'" + " secs on route = {1}".format(tries, timeout, self.route)) + #self.stack.transmit(msg, self.stack.nameRemotes['manor'].uid) tried += 1 time.sleep(0.01) return jobber_rxMsgs.pop(track).get('return', {})