log : added timeout to avoid deadlocks on daemon join

2016-07-13 10:05:34 +02:00
parent 468a6431f9
commit ad16830f71
1 changed files with 1 additions and 1 deletions
--- a/lib/spack/llnl/util/tty/log.py
+++ b/lib/spack/llnl/util/tty/log.py
@@ -218,5 +218,5 @@ def __exit__(self, exc_type, exception, traceback):
    def __del__(self):
        """Closes the pipes and joins the daemon"""
        os.close(self.write)
-        self.p.join()
+        self.p.join(60.0)  # 1 minute to join the daemonic child
        os.close(self.read)