From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Fri, 15 Aug 2014 15:42:07 +0000 (-0400)
Subject: add a finally block to close stderr/stdout
X-Git-Tag: v1.5.12~8^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=291541ca558b29d36e0ec50405e1b320d473039b;p=ceph-deploy.git

add a finally block to close stderr/stdout

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/util/decorators.py b/ceph_deploy/util/decorators.py
index b6d5d15..9565729 100644
--- a/ceph_deploy/util/decorators.py
+++ b/ceph_deploy/util/decorators.py
@@ -1,5 +1,6 @@
 import logging
 import sys
+import traceback
 from functools import wraps
 
 
@@ -67,6 +68,28 @@ def catches(catch=None, handler=None, exit=True):
                     logger.error(make_exception_message(e))
                     if exit:
                         sys.exit(1)
+            except Exception as err:  # anything else
+                str_failure = traceback.format_exc(err)
+                if str_failure:
+                    for line in str_failure.split('\n'):
+                        logger.error("%s" % line)
+                else:  # if for whatever reason we can't get an err message
+                    logger.error(make_exception_message(err))
+
+            finally:
+                # This block is crucial to avoid having issues with
+                # Python spitting non-sense thread exceptions. We have already
+                # handled what we could, so close stderr and stdout.
+                import sys
+                try:
+                    sys.stdout.close()
+                except:
+                    pass
+                try:
+                    sys.stderr.close()
+                except:
+                    pass
+
         return newfunc
 
     return decorate