diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-13 10:05:34 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-13 11:20:23 +0200 |
| commit | ad16830f71812cbe951244ec115e8b3c33f5cefc (patch) | |
| tree | 62f86e8abd469b052c4dde769bf947c0d49bc278 /lib | |
| parent | 468a6431f95e963fe97f3ee49b908566375674bd (diff) | |
| download | spack-ad16830f71812cbe951244ec115e8b3c33f5cefc.tar.gz spack-ad16830f71812cbe951244ec115e8b3c33f5cefc.tar.bz2 spack-ad16830f71812cbe951244ec115e8b3c33f5cefc.tar.xz spack-ad16830f71812cbe951244ec115e8b3c33f5cefc.zip | |
log : added timeout to avoid deadlocks on daemon join
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/llnl/util/tty/log.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |