From 4b9e17626d1d801b91bb3618d52bfb10ce4ebd0b Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Wed, 8 Aug 2012 14:44:47 -0700 Subject: [PATCH] Use tempfile.NamedTemporaryFile instead of mkstemp. Simpler code, no manual cleanup needed. We see a littering of zero-length temp files from teuthology-worker, and this seems like a likely source. --- teuthology/queue.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/teuthology/queue.py b/teuthology/queue.py index aec52453b8..b029075ea7 100644 --- a/teuthology/queue.py +++ b/teuthology/queue.py @@ -117,18 +117,18 @@ def run_job(job_config, archive_path): arg.extend(['--description', job_config['description']]) arg.append('--') - tmp_fp, tmp_path = tempfile.mkstemp() - try: - os.write(tmp_fp, yaml.safe_dump(job_config['config'])) - arg.append(tmp_path) - subprocess.check_call( - args=arg, - close_fds=True, - ) - except subprocess.CalledProcessError as e: - log.exception(e) - else: - log.info('Success!') - finally: - os.close(tmp_fp) - os.unlink(tmp_path) + with tempfile.NamedTemporaryFile( + prefix='teuthology-worker.', + suffix='.tmp', + ) as tmp: + try: + os.write(tmp, yaml.safe_dump(job_config['config'])) + arg.append(tmp.name) + subprocess.check_call( + args=arg, + close_fds=True, + ) + except subprocess.CalledProcessError as e: + log.exception(e) + else: + log.info('Success!') -- 2.39.5