Chromium Code Reviews| Index: example/http-server.dart |
| diff --git a/example/http-server.dart b/example/http-server.dart |
| index fc3b442a092da51c5f97013ec7f3c69aba1a7f9c..74a3f77b96ef5cbc29fa9efda1e52874b3b259ef 100644 |
| --- a/example/http-server.dart |
| +++ b/example/http-server.dart |
| @@ -15,9 +15,9 @@ typedef Future RemoteStop(); |
| Future<RemoteStop> runHttpServer( |
| Runner runner, ServerSocket socket, HttpListener listener) { |
| - return runner.run(_startHttpServer, new List(2)..[0] = socket.reference |
| - ..[1] = listener) |
| - .then((SendPort stopPort) => () => _sendStop(stopPort)); |
| + return runner.run(_startHttpServer, new List(2) |
| + ..[0] = socket.reference |
| + ..[1] = listener).then((SendPort stopPort) => () => _sendStop(stopPort)); |
|
Lasse Reichstein Nielsen
2015/02/26 10:59:13
No to this change. It is not more readable.
|
| } |
| Future _sendStop(SendPort stopPort) { |
| @@ -68,7 +68,7 @@ class EchoHttpListener implements HttpListener { |
| _counter.send(null); |
| print("Request to $_id"); |
| request.response.write("#$_id\n"); |
| - var t0 = new DateTime.now().add(new Duration(seconds:2)); |
| + var t0 = new DateTime.now().add(new Duration(seconds: 2)); |
| while (new DateTime.now().isBefore(t0)); |
| print("Response from $_id"); |
| request.response.close(); |
| @@ -90,30 +90,32 @@ main(args) { |
| } |
| RawReceivePort counter = new RawReceivePort(); |
| HttpListener listener = new EchoHttpListener(counter.sendPort); |
| - ServerSocket |
| - .bind(InternetAddress.ANY_IP_V6, port) |
| - .then((ServerSocket socket) { |
| - port = socket.port; |
| - return Future.wait(new Iterable.generate(5, (_) => IsolateRunner.spawn()), |
| - cleanUp: (isolate) { isolate.close(); }) |
| - .then((List<IsolateRunner> isolates) { |
| - return Future.wait(isolates.map((IsolateRunner isolate) { |
| - return runHttpServer(isolate, socket, listener); |
| - }), cleanUp: (server) { server.stop(); }); |
| - }) |
| - .then((stoppers) { |
| - socket.close(); |
| - int count = 25; |
| - counter.handler = (_) { |
| - count--; |
| - if (count == 0) { |
| - stoppers.forEach((f) => f()); |
| - counter.close(); |
| - } |
| - }; |
| - print("Server listening on port $port for 25 requests"); |
| - print("Test with:"); |
| - print(" ab -c10 -n 25 http://localhost:$port/"); |
| - }); |
| + ServerSocket.bind(InternetAddress.ANY_IP_V6, port).then( |
| + (ServerSocket socket) { |
| + port = socket.port; |
| + return Future |
| + .wait(new Iterable.generate(5, (_) => IsolateRunner.spawn()), |
| + cleanUp: (isolate) { |
| + isolate.close(); |
| + }).then((List<IsolateRunner> isolates) { |
| + return Future.wait(isolates.map((IsolateRunner isolate) { |
| + return runHttpServer(isolate, socket, listener); |
| + }), cleanUp: (server) { |
| + server.stop(); |
| + }); |
| + }).then((stoppers) { |
| + socket.close(); |
| + int count = 25; |
| + counter.handler = (_) { |
| + count--; |
| + if (count == 0) { |
| + stoppers.forEach((f) => f()); |
| + counter.close(); |
| + } |
| + }; |
| + print("Server listening on port $port for 25 requests"); |
| + print("Test with:"); |
| + print(" ab -c10 -n 25 http://localhost:$port/"); |
| + }); |
|
Lasse Reichstein Nielsen
2015/02/26 10:59:13
Also no to this change.
Putting the ".then" after
|
| }); |
| } |