summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2003-01-21 21:05:22 (GMT)
committerGuido van Rossum <guido@python.org>2003-01-21 21:05:22 (GMT)
commit2a1d51602b98effa0feddc2427ba5d8cd0641b77 (patch)
tree9894a45bca4365ca913e804f012b7df038956ee5 /Lib
parent81d40d6f4728d4f023a54217c2e6a4fa23291399 (diff)
downloadcpython-2a1d51602b98effa0feddc2427ba5d8cd0641b77.zip
cpython-2a1d51602b98effa0feddc2427ba5d8cd0641b77.tar.gz
cpython-2a1d51602b98effa0feddc2427ba5d8cd0641b77.tar.bz2
Fix from Vinaj for the "writing to closed file" errors. SF 670390.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/output/test_logging1
-rw-r--r--Lib/test/test_logging.py24
2 files changed, 14 insertions, 11 deletions
diff --git a/Lib/test/output/test_logging b/Lib/test/output/test_logging
index 9e52c03..3cbbebf 100644
--- a/Lib/test/output/test_logging
+++ b/Lib/test/output/test_logging
@@ -1,5 +1,4 @@
test_logging
-About to start TCP server...
-- log_test0 begin ---------------------------------------------------
CRITICAL:ERR:Message 0
ERROR:ERR:Message 1
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 4e74394..113df5c 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -24,7 +24,7 @@
Copyright (C) 2001-2002 Vinay Sajip. All Rights Reserved.
"""
-from select import select
+import select
import os, sys, string, struct, types, cPickle, cStringIO
import socket, threading, time, locale
import logging, logging.handlers, logging.config
@@ -64,7 +64,6 @@ class LogRecordStreamHandler(StreamRequestHandler):
if len(chunk) < 4:
break
slen = struct.unpack(">L", chunk)[0]
- #print slen
chunk = self.connection.recv(slen)
while len(chunk) < slen:
chunk = chunk + self.connection.recv(slen - len(chunk))
@@ -102,13 +101,19 @@ class LogRecordSocketReceiver(ThreadingTCPServer):
def serve_until_stopped(self):
abort = 0
while not abort:
- rd, wr, ex = select([self.socket.fileno()],
+ rd, wr, ex = select.select([self.socket.fileno()],
[], [],
self.timeout)
if rd:
self.handle_request()
abort = self.abort
+ def process_request(self, request, client_address):
+ #import threading
+ t = threading.Thread(target = self.finish_request,
+ args = (request, client_address))
+ t.start()
+
def runTCP(tcpserver):
tcpserver.serve_until_stopped()
@@ -421,7 +426,7 @@ def test_main():
#Set up servers
threads = []
tcpserver = LogRecordSocketReceiver()
- sys.stdout.write("About to start TCP server...\n")
+ #sys.stdout.write("About to start TCP server...\n")
threads.append(threading.Thread(target=runTCP, args=(tcpserver,)))
for thread in threads:
@@ -447,18 +452,17 @@ def test_main():
test3()
banner("log_test3", "end")
- banner("logrecv output", "begin")
- sys.stdout.write(sockOut.getvalue())
- sockOut.close()
- banner("logrecv output", "end")
-
finally:
#shut down server
tcpserver.abort = 1
for thread in threads:
thread.join()
+ banner("logrecv output", "begin")
+ sys.stdout.write(sockOut.getvalue())
+ sockOut.close()
+ banner("logrecv output", "end")
+ sys.stdout.flush()
if __name__ == "__main__":
sys.stdout.write("test_logging\n")
test_main()
- sys.stdout.flush()