NotificationsYou must be signed in to change notification settings
Fork34.1k
Star71.6k

Commitb8f4163

authored

bpo-31233: socketserver.ThreadingMixIn.server_close() (#3523)

socketserver.ThreadingMixIn now keeps a list of non-daemonic threadsto wait until all these threads complete in server_close().Reenable test_logging skipped tests.Fix SocketHandlerTest.tearDown(): close the socket handler beforestopping the server, so the server can join threads.

1 parent97d7e65 commitb8f4163Copy full SHA for b8f4163

File tree

3 files changed

+19

-11

lines changed

Lib
- socketserver.py
- test
  - test_logging.py
Misc/NEWS.d/next/Library
- 2017-09-13-02-17-11.bpo-31233.r-IPIu.rst

3 files changed

+19

-11

lines changed

`‎Lib/socketserver.py‎`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -629,6 +629,9 @@ class ThreadingMixIn:`
`629`	`629`	`# Decides how threads will act upon termination of the`
`630`	`630`	`# main process`
`631`	`631`	`daemon_threads=False`
	`632`	`+# For non-daemonic threads, list of threading.Threading objects`
	`633`	`+# used by server_close() to wait for all threads completion.`
	`634`	`+_threads=None`
`632`	`635`
`633`	`636`	`defprocess_request_thread(self,request,client_address):`
`634`	`637`	`"""Same as in BaseServer but as a thread.`
`@@ -648,8 +651,20 @@ def process_request(self, request, client_address):`
`648`	`651`	`t=threading.Thread(target=self.process_request_thread,`
`649`	`652`	`args= (request,client_address))`
`650`	`653`	`t.daemon=self.daemon_threads`
	`654`	`+ifnott.daemon:`
	`655`	`+ifself._threadsisNone:`
	`656`	`+self._threads= []`
	`657`	`+self._threads.append(t)`
`651`	`658`	`t.start()`
`652`	`659`
	`660`	`+defserver_close(self):`
	`661`	`+super().server_close()`
	`662`	`+threads=self._threads`
	`663`	`+self._threads=None`
	`664`	`+ifthreads:`
	`665`	`+forthreadinthreads:`
	`666`	`+thread.join()`
	`667`	`+`
`653`	`668`
`654`	`669`	`ifhasattr(os,"fork"):`
`655`	`670`	`classForkingUDPServer(ForkingMixIn,UDPServer):pass`

`‎Lib/test/test_logging.py‎`

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1465,7 +1465,6 @@ def test_logger_disabling(self):`
`1465`	`1465`	`self.assertFalse(logger.disabled)`
`1466`	`1466`
`1467`	`1467`
`1468`		`-@unittest.skipIf(True,"FIXME: bpo-30830")`
`1469`	`1468`	`classSocketHandlerTest(BaseTest):`
`1470`	`1469`
`1471`	`1470`	`"""Test for SocketHandler objects."""`
`@@ -1502,11 +1501,11 @@ def setUp(self):`
`1502`	`1501`	`deftearDown(self):`
`1503`	`1502`	`"""Shutdown the TCP server."""`
`1504`	`1503`	`try:`
`1505`		`-ifself.server:`
`1506`		`-self.server.stop(2.0)`
`1507`	`1504`	`ifself.sock_hdlr:`
`1508`	`1505`	`self.root_logger.removeHandler(self.sock_hdlr)`
`1509`	`1506`	`self.sock_hdlr.close()`
	`1507`	`+ifself.server:`
	`1508`	`+self.server.stop(2.0)`
`1510`	`1509`	`finally:`
`1511`	`1510`	`BaseTest.tearDown(self)`
`1512`	`1511`
`@@ -1563,7 +1562,6 @@ def _get_temp_domain_socket():`
`1563`	`1562`	`os.remove(fn)`
`1564`	`1563`	`returnfn`
`1565`	`1564`
`1566`		`-@unittest.skipIf(True,"FIXME: bpo-30830")`
`1567`	`1565`	`@unittest.skipUnless(hasattr(socket,"AF_UNIX"),"Unix sockets required")`
`1568`	`1566`	`classUnixSocketHandlerTest(SocketHandlerTest):`
`1569`	`1567`
`@@ -1581,7 +1579,6 @@ def tearDown(self):`
`1581`	`1579`	`SocketHandlerTest.tearDown(self)`
`1582`	`1580`	`support.unlink(self.address)`
`1583`	`1581`
`1584`		`-@unittest.skipIf(True,"FIXME: bpo-30830")`
`1585`	`1582`	`classDatagramHandlerTest(BaseTest):`
`1586`	`1583`
`1587`	`1584`	`"""Test for DatagramHandler."""`
`@@ -1646,7 +1643,6 @@ def test_output(self):`
`1646`	`1643`	`self.handled.wait()`
`1647`	`1644`	`self.assertEqual(self.log_output,"spam\neggs\n")`
`1648`	`1645`
`1649`		`-@unittest.skipIf(True,"FIXME: bpo-30830")`
`1650`	`1646`	`@unittest.skipUnless(hasattr(socket,"AF_UNIX"),"Unix sockets required")`
`1651`	`1647`	`classUnixDatagramHandlerTest(DatagramHandlerTest):`
`1652`	`1648`
`@@ -1731,7 +1727,6 @@ def test_output(self):`
`1731`	`1727`	`self.handled.wait()`
`1732`	`1728`	`self.assertEqual(self.log_output,b'<11>h\xc3\xa4m-sp\xc3\xa4m')`
`1733`	`1729`
`1734`		`-@unittest.skipIf(True,"FIXME: bpo-30830")`
`1735`	`1730`	`@unittest.skipUnless(hasattr(socket,"AF_UNIX"),"Unix sockets required")`
`1736`	`1731`	`classUnixSysLogHandlerTest(SysLogHandlerTest):`
`1737`	`1732`
`@@ -1749,7 +1744,6 @@ def tearDown(self):`
`1749`	`1744`	`SysLogHandlerTest.tearDown(self)`
`1750`	`1745`	`support.unlink(self.address)`
`1751`	`1746`
`1752`		`-@unittest.skipIf(True,"FIXME: bpo-30830")`
`1753`	`1747`	`@unittest.skipUnless(support.IPV6_ENABLED,`
`1754`	`1748`	`'IPv6 support required for this test.')`
`1755`	`1749`	`classIPv6SysLogHandlerTest(SysLogHandlerTest):`
`@@ -2872,9 +2866,6 @@ def test_config14_ok(self):`
`2872`	`2866`	`logging.warning('Exclamation')`
`2873`	`2867`	`self.assertTrue(output.getvalue().endswith('Exclamation!\n'))`
`2874`	`2868`
`2875`		`-# listen() uses ConfigSocketReceiver which is based`
`2876`		`-# on socketserver.ThreadingTCPServer`
`2877`		`-@unittest.skipIf(True,"FIXME: bpo-30830")`
`2878`	`2869`	`defsetup_via_listener(self,text,verify=None):`
`2879`	`2870`	`text=text.encode("utf-8")`
`2880`	`2871`	`# Ask for a randomly assigned port (by using port 0)`

`‎Misc/NEWS.d/next/Library/2017-09-13-02-17-11.bpo-31233.r-IPIu.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+socketserver.ThreadingMixIn now keeps a list of non-daemonic threads to wait`
	`2`	`+until all these threads complete in server_close().`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb8f4163

File tree

3 files changed

3 files changed

`‎Lib/socketserver.py‎`

`‎Lib/test/test_logging.py‎`

`‎Misc/NEWS.d/next/Library/2017-09-13-02-17-11.bpo-31233.r-IPIu.rst‎`

0 commit comments