From: Alfredo Deza <alfredo@deza.pe>
Date: Thu, 10 Oct 2013 14:20:40 +0000 (-0400)
Subject: logging will now use the global timeout
X-Git-Tag: 0.0.6~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9be783bd2825ae048abce88c9e21fc88bc970e9d;p=remoto.git

logging will now use the global timeout
---

diff --git a/remoto/log.py b/remoto/log.py
index aba9538..f86acb9 100644
--- a/remoto/log.py
+++ b/remoto/log.py
@@ -1,7 +1,7 @@
 
 
 def reporting(conn, result, timeout=None):
-    timeout = timeout or -1  # a.k.a. wait for ever
+    timeout = timeout or conn.global_timeout # -1 a.k.a. wait for ever
     log_map = {'debug': conn.logger.debug, 'error': conn.logger.error}
     while True:
         try: