Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1201)

Unified Diff: pkg/http_multi_server/lib/src/utils.dart

Issue 411203002: Swallow errors in subscriptions in http_multi_server.. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/http_multi_server/lib/http_multi_server.dart ('k') | pkg/http_multi_server/pubspec.yaml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/http_multi_server/lib/src/utils.dart
diff --git a/pkg/http_multi_server/lib/src/utils.dart b/pkg/http_multi_server/lib/src/utils.dart
index 9e95aba5f9d82612e7bf2d3632c762dd156e8ced..d6159753c376fcf6715440a16328622f52d14fc2 100644
--- a/pkg/http_multi_server/lib/src/utils.dart
+++ b/pkg/http_multi_server/lib/src/utils.dart
@@ -7,6 +7,8 @@ library http_multi_server.utils;
import 'dart:async';
import 'dart:io';
+// TODO(nweiz): Revert this to the version of [mergeStreams] found elsewhere in
+// the repo once issue 19815 is fixed in dart:io.
/// Merges all streams in [streams] into a single stream that emits all of their
/// values.
///
@@ -18,9 +20,17 @@ Stream mergeStreams(Iterable<Stream> streams) {
controller = new StreamController(onListen: () {
for (var stream in streams) {
var subscription;
- subscription = stream.listen(controller.add,
- onError: controller.addError,
- onDone: () {
+ subscription = stream.listen(controller.add, onError: (error, trace) {
+ if (subscriptions.length == 1) {
+ // If the last subscription errored, pass it on.
+ controller.addError(error, trace);
+ } else {
+ // If only one of the subscriptions has an error (usually IPv6 failing
+ // late), then just remove that subscription and ignore the error.
+ subscriptions.remove(subscription);
+ subscription.cancel();
+ }
+ }, onDone: () {
subscriptions.remove(subscription);
if (subscriptions.isEmpty) controller.close();
});
@@ -42,21 +52,3 @@ Stream mergeStreams(Iterable<Stream> streams) {
return controller.stream;
}
-
-/// A cache for [supportsIpV6].
-bool _supportsIpV6;
-
-/// Returns whether this computer supports binding to IPv6 addresses.
-Future<bool> get supportsIpV6 {
- if (_supportsIpV6 != null) return new Future.value(_supportsIpV6);
-
- return ServerSocket.bind(InternetAddress.LOOPBACK_IP_V6, 0).then((socket) {
- _supportsIpV6 = true;
- socket.close();
- return true;
- }).catchError((error) {
- if (error is! SocketException) throw error;
- _supportsIpV6 = false;
- return false;
- });
-}
« no previous file with comments | « pkg/http_multi_server/lib/http_multi_server.dart ('k') | pkg/http_multi_server/pubspec.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698