Visitar URL original
Use process.start instead of process.run in ssh client. by godofredoc · Pull Request #178 · flutter/packages · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use a memory file to return stdout and stderr in the OperationResult.
  • Loading branch information
godofredoc committed Jul 14, 2020
commit 8eb907bcccae32c9030371c6621834f31aca418c
21 changes: 15 additions & 6 deletions packages/fuchsia_ctl/lib/src/ssh_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';

import 'package:file/memory.dart';
import 'package:fuchsia_ctl/src/logger.dart';
import 'package:meta/meta.dart';
import 'package:pedantic/pedantic.dart';
Expand Down Expand Up @@ -100,8 +101,16 @@ class SshClient {
assert(identityFilePath != null);
assert(command != null);

MemoryFileSystem fs;

// If no file is passed to this method we create a memoryfile to keep to
// return the stdout in OperationResult.
if (logFile == null) {
fs = MemoryFileSystem();
logFile = fs.file('logs');
}

final Logger logger = PrintLogger();
final List<String> logs = <String>[];

final Process process = await processManager.start(
getSshArguments(
Expand All @@ -115,14 +124,14 @@ class SshClient {
.transform(const LineSplitter())
.listen((String log) {
logger.info(log);
logs.add(log);
logFile.writeAsString(log);
});
final StreamSubscription<String> stderrSubscription = process.stderr
.transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String log) {
logger.warning(log);
logs.add(log);
logFile.writeAsString(log);
});

// Wait for stdout and stderr to be fully processed because proc.exitCode
Expand All @@ -137,9 +146,9 @@ class SshClient {
unawaited(stderrSubscription.cancel());

final int exitCode = await process.exitCode.timeout(timeoutMs);

final String output = fs != null ? logFile.readAsStringSync() : '';
return exitCode != 0
? OperationResult.error('Failed', info: logs.toString())
: OperationResult.success(info: logs.toString());
? OperationResult.error('Failed', info: output)
: OperationResult.success(info: output);
}
}
6 changes: 1 addition & 5 deletions packages/fuchsia_ctl/test/ssh_client_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,7 @@ void main() {
final MockProcessManager processManager = MockProcessManager();

when(processManager.start(any)).thenAnswer((_) async {
return FakeProcess(0, <String>[''], <String>['']);
});

when(processManager.run(any)).thenAnswer((_) async {
return ProcessResult(0, 0, 'Good job', '');
return FakeProcess(0, <String>['abc'], <String>['cdf']);
});

final SshClient ssh = SshClient(processManager: processManager);
Expand Down