Gracefully handle stdin flush failure on BSD

Code Issues Proposed changes

Catches an IOError that is thrown when starting Swift on BSD-based
platforms, as the underlying system call to flush returns errno 9 (bad
file descriptor), whereas on Linux it succeeds.
Change-Id: Ic143d2fe6c3e1e0b39794958b40b0f5efdc17c06

This commit is contained in:

Brian Cline

2012年09月21日 11:17:35 -05:00

parent 8a7afa535f

commit 87c1c5dce9

1 changed files with 6 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

7
swift/common/utils.py

View File

@@ -685,7 +685,12 @@ def capture_stdio(logger, **kwargs):

with open(os.devnull, 'r+b') as nullfile:

# close stdio (excludes fds open for logging)

for f in stdio_files:

f.flush()

# some platforms throw an error when attempting an stdin flush

try:

f.flush()

except IOError:

pass

try:

os.dup2(nullfile.fileno(), f.fileno())

except OSError:

Gracefully handle stdin flush failure on BSD

7 swift/common/utils.py Unescape Escape View File

7
swift/common/utils.py

View File