From 2ee1bc7148d45719e5ea86abf1f368d17ae76c2a Mon Sep 17 00:00:00 2001 From: david-sarah <david-sarah@jacaranda.org> Date: Sun, 20 May 2012 15:35:29 +0000 Subject: [PATCH] Catch exceptions from CLI in order to prevent the Ubuntu crash monolog from triggering. refs #1746 --- src/allmydata/scripts/runner.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index e66f8d33..210efb65 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -109,9 +109,15 @@ def runner(argv, def run(install_node_control=True): - if sys.platform == "win32": - from allmydata.windows.fixups import initialize - initialize() + try: + if sys.platform == "win32": + from allmydata.windows.fixups import initialize + initialize() + + rc = runner(sys.argv[1:], install_node_control=install_node_control) + except Exception: + import traceback + traceback.print_exc() + rc = 1 - rc = runner(sys.argv[1:], install_node_control=install_node_control) sys.exit(rc) -- 2.45.2