Author: gstein
Date: Fri May 4 01:12:34 2012
New Revision: 1333728
URL: http://svn.apache.org/viewvc?rev=1333728&view=rev
Log:
Followup to r1333602: don't keep installing handlers. One is more than
enough! (symptom: massive repeat of output)
* subversion/tests/cmdline/svntest/main.py:
(execute_tests): only add a handler if the current set is empty
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1333728&r1=1333727&r2=1333728&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Fri May 4
01:12:34 2012
@@ -1716,17 +1716,21 @@ def execute_tests(test_list, serial_only
else:
parser = _create_parser()
- # Now that we have some options, let's get the logger configured before
- # doing anything more
- if options.log_with_timestamps:
- formatter = AbbreviatedFormatter('%(levelshort)s:'
- ' [%(asctime)s] %(message)s',
- datefmt='%Y-%m-%d %H:%M:%S')
- else:
- formatter = AbbreviatedFormatter('%(levelshort)s: %(message)s')
- handler = logging.StreamHandler(sys.stdout)
- handler.setFormatter(formatter)
- logger.addHandler(handler)
+ # If there are no handlers registered yet, then install our own with
+ # our custom formatter. (anything currently installed *is* our handler
+ # as tested above)
+ if not logger.handlers:
+ # Now that we have some options, let's get the logger configured before
+ # doing anything more
+ if options.log_with_timestamps:
+ formatter = AbbreviatedFormatter('%(levelshort)s:'
+ ' [%(asctime)s] %(message)s',
+ datefmt='%Y-%m-%d %H:%M:%S')
+ else:
+ formatter = AbbreviatedFormatter('%(levelshort)s: %(message)s')
+ handler = logging.StreamHandler(sys.stdout)
+ handler.setFormatter(formatter)
+ logger.addHandler(handler)
# parse the positional arguments (test nums, names)
for arg in test_selection:
