Merge pull request #1 from oohlaf/fixes

API changed to create_server
aio-libs · Oct 13, 2013 · c22c40f · c22c40f
2 parents 2baa6c3 + bd4d2f4
commit c22c40f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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()

diff --git 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()