Fix ResourceWarning in tcp and udp echo examples

2 files changed, 9 insertions, 5 deletions

diff --git a/examples/tcp_echo.py b/examples/tcp_echo.py
index 45ece15..3c08b15 100755
--- a/examples/tcp_echo.py
+++ b/examples/tcp_echo.py
@@ -71,8 +71,7 @@ def start_client(loop, host, port):
 
 def start_server(loop, host, port):
     f = loop.create_server(EchoServer, host, port)
-    s = loop.run_until_complete(f)
-    print('serving on', s.sockets[0].getsockname())
+    return loop.run_until_complete(f)
 
 
 ARGS = argparse.ArgumentParser(description="TCP Echo example.")
@@ -106,11 +105,13 @@ if __name__ == '__main__':
             loop.add_signal_handler(signal.SIGINT, loop.stop)
 
         if args.server:
-            start_server(loop, args.host, args.port)
+            server = start_server(loop, args.host, args.port)
         else:
             start_client(loop, args.host, args.port)
 
         try:
             loop.run_forever()
         finally:
+            if args.server:
+                server.close()
             loop.close()
diff --git a/examples/udp_echo.py b/examples/udp_echo.py
index 899728b..93ac7e6 100755
--- a/examples/udp_echo.py
+++ b/examples/udp_echo.py
@@ -52,7 +52,8 @@ class MyClientUdpEchoProtocol:
 def start_server(loop, addr):
     t = asyncio.Task(loop.create_datagram_endpoint(
         MyServerUdpEchoProtocol, local_addr=addr))
-    loop.run_until_complete(t)
+    transport, server = loop.run_until_complete(t)
+    return transport
 
 
 def start_client(loop, addr):
@@ -91,11 +92,13 @@ if __name__ == '__main__':
             loop.add_signal_handler(signal.SIGINT, loop.stop)
 
         if '--server' in sys.argv:
-            start_server(loop, (args.host, args.port))
+            server = start_server(loop, (args.host, args.port))
         else:
             start_client(loop, (args.host, args.port))
 
         try:
             loop.run_forever()
         finally:
+            if '--server' in sys.argv:
+                server.close()
             loop.close()