github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do exponential backoff for all exceptions in VMService::defaultOpenChannel. (#16785)

Browse Source 
We were trying to only catch WebSocketException, but in fact
SocketException can be thrown as well.
This commit is contained in:
Todd Volkert 2018-04-19 23:36:15 -07:00 committed by GitHub
parent 060a1adec1
commit 12bbaba9ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/lib/src/vmservice.dart
View File

@ -53,7 +53,7 @@ Future<StreamChannel<String>> _defaultOpenChannel(Uri uri) async {
attempts += 1; attempts += 1;
try { try {
socket = await io.WebSocket.connect(uri.toString()); socket = await io.WebSocket.connect(uri.toString());
} on io.WebSocketException catch(e) { } catch (e) {
printTrace('Exception attempting to connect to observatory: $e'); printTrace('Exception attempting to connect to observatory: $e');
printTrace('This was attempt #$attempts. Will retry in $delay.'); printTrace('This was attempt #$attempts. Will retry in $delay.');
await new Future<Null>.delayed(delay); await new Future<Null>.delayed(delay);

8
packages/flutter_tools/test/vmservice_test.dart
View File

@ -4,17 +4,19 @@
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/base/port_scanner.dart'; import 'package:flutter_tools/src/base/port_scanner.dart';
import 'package:flutter_tools/src/vmservice.dart'; import 'package:flutter_tools/src/vmservice.dart';
import 'src/common.dart';
import 'src/context.dart';
void main() { void main() {
group('VMService', () { group('VMService', () {
test('fails connection eagerly in the connect() method', () async { testUsingContext('fails connection eagerly in the connect() method', () async {
final int port = await const HostPortScanner().findAvailablePort(); final int port = await const HostPortScanner().findAvailablePort();
expect( expect(
VMService.connect(Uri.parse('http://localhost:$port')), VMService.connect(Uri.parse('http://localhost:$port')),
throwsA(const isInstanceOf<SocketException>()), throwsToolExit(),
); );
}); });
}); });