From 3f6a251faf324209247a868c91a9bacdea427db1 Mon Sep 17 00:00:00 2001 From: bescoto Date: Sat, 19 Nov 2005 03:10:03 +0000 Subject: Error reporting cleanup git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@684 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/rdiff_backup/log.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'rdiff-backup/rdiff_backup/log.py') diff --git a/rdiff-backup/rdiff_backup/log.py b/rdiff-backup/rdiff_backup/log.py index f977420..93933e6 100644 --- a/rdiff-backup/rdiff_backup/log.py +++ b/rdiff-backup/rdiff_backup/log.py @@ -156,9 +156,9 @@ class Logger: assert no_fatal_message == 0 or no_fatal_message == 1 if no_fatal_message: prefix_string = "" else: prefix_string = "Fatal Error: " - self(prefix_string + message, 1) - import Main - Main.cleanup() + self.log_to_term(prefix_string + message, 1) + #import Main + #Main.cleanup() sys.exit(errlevel) def exception_to_string(self, arglist = []): @@ -182,10 +182,13 @@ class Logger: if (only_terminal == 0 or (only_terminal == 1 and self.log_file_open)): logging_func = self.__call__ - else: logging_func = self.log_to_term + else: + logging_func = self.log_to_term + if verbosity >= self.term_verbosity: return logging_func(self.exception_to_string(), verbosity) + Log = Logger() -- cgit v1.2.1