From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Tue, 19 Aug 2014 18:57:49 +0000 (-0400)
Subject: rename main to _main to avoid fixing scripts
X-Git-Tag: v1.5.12~7^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50cb20a98a5928beba548adf4bfba36935f945fc;p=ceph-deploy.git

rename main to _main to avoid fixing scripts

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

diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py
index a6dfead..2c7da85 100644
--- a/ceph_deploy/cli.py
+++ b/ceph_deploy/cli.py
@@ -99,7 +99,7 @@ def get_parser():
 
 
 @catches((KeyboardInterrupt, RuntimeError, exc.DeployError,), handle_all=True)
-def main(args=None, namespace=None):
+def _main(args=None, namespace=None):
     parser = get_parser()
 
     if len(sys.argv) < 2:
@@ -147,3 +147,21 @@ def main(args=None, namespace=None):
     )
 
     return args.func(args)
+
+
+def main(args=None, namespace=None):
+    try:
+        _main(args=None, namespace=None)
+    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.
+        if not os.environ.get('CEPH_DEPLOY_TEST'):
+            try:
+                sys.stdout.close()
+            except:
+                pass
+            try:
+                sys.stderr.close()
+            except:
+                pass