mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Close handlers and tidy up loggers by removing closed handlers - to avoid problems when run twice (SF #1002537)

Browse source
This commit is contained in:
Vinay Sajip 2004-08-04 08:29:14 +00:00
parent 4189c643f8
commit 6887c92b1e
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/test/test_logging.py
View file

@ -411,7 +411,7 @@ def test_main_inner():
#Set up a handler such that all events are sent via a socket to the log #Set up a handler such that all events are sent via a socket to the log
#receiver (logrecv). #receiver (logrecv).
#The handler will only be added to the rootLogger for some of the tests #The handler will only be added to the rootLogger for some of the tests
hdlr = logging.handlers.SocketHandler('localhost', shdlr = logging.handlers.SocketHandler('localhost',
logging.handlers.DEFAULT_TCP_LOGGING_PORT) logging.handlers.DEFAULT_TCP_LOGGING_PORT)
#Configure the logger for logrecv so events do not propagate beyond it. #Configure the logger for logrecv so events do not propagate beyond it.
@ -437,10 +437,10 @@ def test_main_inner():
try: try:
banner("log_test0", "begin") banner("log_test0", "begin")
rootLogger.addHandler(hdlr) rootLogger.addHandler(shdlr)
test0() test0()
hdlr.close() shdlr.close()
rootLogger.removeHandler(hdlr) rootLogger.removeHandler(shdlr)
banner("log_test0", "end") banner("log_test0", "end")
@ -463,10 +463,16 @@ def test_main_inner():
thread.join() thread.join()
banner("logrecv output", "begin") banner("logrecv output", "begin")
sys.stdout.write(sockOut.getvalue()) sys.stdout.write(sockOut.getvalue())
sockhdlr.close()
sockOut.close() sockOut.close()
sockLogger.removeHandler(sockhdlr)
sockhdlr.close()
banner("logrecv output", "end") banner("logrecv output", "end")
sys.stdout.flush() sys.stdout.flush()
try:
hdlr.close()
except:
pass
rootLogger.removeHandler(hdlr)
def test_main(): def test_main():
import locale import locale