From 621cc4e377e0bf0a48a7bbbf384a3f28d9933be9 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 24 Jul 2008 12:42:04 -0400 Subject: [PATCH] merge with the code from func remove a spurious debug line --- certmaster/utils.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/certmaster/utils.py b/certmaster/utils.py index 588e986..61721ac 100755 --- a/certmaster/utils.py +++ b/certmaster/utils.py @@ -44,7 +44,7 @@ def daemonize(pidfile=None): Writes the new PID to the provided file name if not None. """ - print pidfile +# print pidfile pid = os.fork() if pid > 0: sys.exit(0) @@ -57,12 +57,15 @@ def daemonize(pidfile=None): open(pidfile, "w").write(str(pid)) sys.exit(0) + def nice_exception(etype, evalue, etb): - # FIXME: I believe we can remove this function etype = str(etype) - lefti = etype.index("'") + 1 - righti = etype.rindex("'") - nicetype = etype[lefti:righti] + try: + lefti = etype.index("'") + 1 + righti = etype.rindex("'") + nicetype = etype[lefti:righti] + except: + nicetype = etype nicestack = string.join(traceback.format_list(traceback.extract_tb(etb))) return [ REMOTE_ERROR, nicetype, str(evalue), nicestack ] -- 2.39.2