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

increase the timeout for service discovery (#10965)

Browse Source 
* increase the timeout for service discovery

* remove the timeout for discovering service ports
This commit is contained in:
Devon Carew 2017-06-29 14:35:20 -07:00 committed by GitHub
parent be228eae78
commit 94e14f0c5a
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/flutter_tools/lib/src/protocol_discovery.dart
View File

@ -22,10 +22,6 @@ class ProtocolDiscovery {
assert(logReader != null); assert(logReader != null);
assert(portForwarder == null || defaultHostPort != null); assert(portForwarder == null || defaultHostPort != null);
_deviceLogSubscription = logReader.logLines.listen(_handleLine); _deviceLogSubscription = logReader.logLines.listen(_handleLine);
_timer = new Timer(const Duration(seconds: 60), () {
_stopScrapingLogs();
_completer.completeError(new ToolExit('Timeout while attempting to retrieve URL for $serviceName'));
});
} }
factory ProtocolDiscovery.observatory( factory ProtocolDiscovery.observatory(
@ -66,7 +62,6 @@ class ProtocolDiscovery {
final Completer<Uri> _completer = new Completer<Uri>(); final Completer<Uri> _completer = new Completer<Uri>();
StreamSubscription<String> _deviceLogSubscription; StreamSubscription<String> _deviceLogSubscription;
Timer _timer;
/// The discovered service URI. /// The discovered service URI.
Future<Uri> get uri => _completer.future; Future<Uri> get uri => _completer.future;
@ -74,8 +69,6 @@ class ProtocolDiscovery {
Future<Null> cancel() => _stopScrapingLogs(); Future<Null> cancel() => _stopScrapingLogs();
Future<Null> _stopScrapingLogs() async { Future<Null> _stopScrapingLogs() async {
_timer?.cancel();
_timer = null;
await _deviceLogSubscription?.cancel(); await _deviceLogSubscription?.cancel();
_deviceLogSubscription = null; _deviceLogSubscription = null;
} }
@ -106,11 +99,7 @@ class ProtocolDiscovery {
if (portForwarder != null) { if (portForwarder != null) {
final int devicePort = deviceUri.port; final int devicePort = deviceUri.port;
int hostPort = this.hostPort ?? await portScanner.findPreferredPort(defaultHostPort); int hostPort = this.hostPort ?? await portScanner.findPreferredPort(defaultHostPort);
hostPort = await portForwarder hostPort = await portForwarder.forward(devicePort, hostPort: hostPort);
.forward(devicePort, hostPort: hostPort)
.timeout(const Duration(seconds: 60), onTimeout: () {
throwToolExit('Timeout while atempting to foward device port $devicePort for $serviceName');
});
printTrace('Forwarded host port $hostPort to device port $devicePort for $serviceName'); printTrace('Forwarded host port $hostPort to device port $devicePort for $serviceName');
hostUri = deviceUri.replace(port: hostPort); hostUri = deviceUri.replace(port: hostPort);
} }