From ad16830f71812cbe951244ec115e8b3c33f5cefc Mon Sep 17 00:00:00 2001 From: alalazo Date: Wed, 13 Jul 2016 10:05:34 +0200 Subject: log : added timeout to avoid deadlocks on daemon join --- lib/spack/llnl/util/tty/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index cff7f22dcd..7f88261e34 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -218,5 +218,5 @@ class log_output(object): 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) -- cgit v1.2.3-60-g2f50