commit e87ae65a2f15db44a027f37e0b62f0c46db9365d
author koder aka kdanilov <kdanilov@mirantis.com> Mon Apr 20 02:14:35 2015 +0300
committer koder aka kdanilov <kdanilov@mirantis.com> Mon Apr 20 02:14:35 2015 +0300
tree 926045652fcdcf54e879aee158798f5741e18919
parent 168f6094c4c9ff753995aac1c2213cd8d8c9a7f3

more improvements and fixes and new bugs

wally/ssh_utils.py

diff --git a/wally/ssh_utils.py b/wally/ssh_utils.py
index 0de7816..f1818ad 100644
--- a/wally/ssh_utils.py
+++ b/wally/ssh_utils.py
@@ -59,15 +59,15 @@
         except socket.error:
             retry_left = retry_count - i - 1
 
-            if log_warns:
-                msg = "Node {0.host}:{0.port} connection timeout."
+            if retry_left > 0:
+                if log_warns:
+                    msg = "Node {0.host}:{0.port} connection timeout."
 
-                if 0 != retry_left:
-                    msg += " {0} retry left.".format(retry_left)
+                    if 0 != retry_left:
+                        msg += " {0} retry left.".format(retry_left)
 
-                logger.warning(msg.format(creds))
-
-            if 0 == retry_left:
+                    logger.warning(msg.format(creds))
+            else:
                 raise
 
             time.sleep(1)