Close some file handles explicitly in facts.py

Helps control open file descriptor count with pypy (which is used with
one coreos + ansible example).  Part of a fix for
https://github.com/ansible/ansible/issues/10157
release1.8.3
Toshio Kuratomi 10 years ago committed by James Cammarata
parent 0af7e212a8
commit 8be7716064

@ -2381,9 +2381,13 @@ class SunOSVirtual(Virtual):
def get_file_content(path, default=None): def get_file_content(path, default=None):
data = default data = default
if os.path.exists(path) and os.access(path, os.R_OK): if os.path.exists(path) and os.access(path, os.R_OK):
data = open(path).read().strip() try:
datafile = open(path)
data = datafile.read().strip()
if len(data) == 0: if len(data) == 0:
data = default data = default
finally:
datafile.close()
return data return data
def ansible_facts(module): def ansible_facts(module):

Loading…
Cancel
Save