From 30a3e939f0880a5a1116afa3b3bda7ab10285b88 Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Sun, 13 Oct 2013 22:28:48 +0200 Subject: [PATCH 1/2] API changed to create_server --- examples/mpsrv.py | 5 +++-- examples/srv.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/mpsrv.py b/examples/mpsrv.py index c9323700311..00dd6ce30f5 100755 --- a/examples/mpsrv.py +++ b/examples/mpsrv.py @@ -124,9 +124,10 @@ def stop(): os._exit(0) loop.add_signal_handler(signal.SIGINT, stop) - f = loop.start_serving( + f = loop.create_server( lambda: HttpServer(debug=True, keep_alive=75), sock=self.sock) - x = loop.run_until_complete(f)[0] + srv = loop.run_until_complete(f) + x = srv.sockets[0] print('Starting srv worker process {} on {}'.format( os.getpid(), x.getsockname())) diff --git a/examples/srv.py b/examples/srv.py index cd39707527b..fee6ac3af24 100755 --- a/examples/srv.py +++ b/examples/srv.py @@ -149,10 +149,11 @@ def main(): sslcontext = None loop = tulip.get_event_loop() - f = loop.start_serving( + f = loop.create_server( lambda: HttpServer(debug=True, keep_alive=75), args.host, args.port, ssl=sslcontext) - socks = loop.run_until_complete(f) + svr = loop.run_until_complete(f) + socks = svr.sockets print('serving on', socks[0].getsockname()) try: loop.run_forever() From bd4d2f48fdb11ca15dad4675d8b05c61ae0e5361 Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Sun, 13 Oct 2013 22:42:40 +0200 Subject: [PATCH 2/2] Use create_server for tcp protocol example. --- examples/tcp_protocol_parser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/tcp_protocol_parser.py b/examples/tcp_protocol_parser.py index a4b92d2dc70..665699a1d2a 100755 --- a/examples/tcp_protocol_parser.py +++ b/examples/tcp_protocol_parser.py @@ -133,8 +133,9 @@ def start_client(loop, host, port): def start_server(loop, host, port): - f = loop.start_serving(EchoServer, host, port) - x = loop.run_until_complete(f)[0] + f = loop.create_server(EchoServer, host, port) + srv = loop.run_until_complete(f) + x = srv.sockets[0] print('serving on', x.getsockname()) loop.run_forever()