Commit 2bc289de authored by Ian Fischer's avatar Ian Fischer

Merge pull request #61 from iansf/android_logs

Add optional prefix to runCommandAndStreamOutput for logs commands.
parents 6a5fe195 a6635489
...@@ -334,7 +334,7 @@ class AndroidDevice extends _Device { ...@@ -334,7 +334,7 @@ class AndroidDevice extends _Device {
'-s', '-s',
'sky', 'sky',
'chromium', 'chromium',
]); ], prefix: 'ANDROID: ');
} }
@override @override
......
...@@ -14,15 +14,16 @@ final Logger _logging = new Logger('sky_tools.process'); ...@@ -14,15 +14,16 @@ final Logger _logging = new Logger('sky_tools.process');
/// This runs the command and streams stdout/stderr from the child process to /// This runs the command and streams stdout/stderr from the child process to
/// this process' stdout/stderr. /// this process' stdout/stderr.
Future<int> runCommandAndStreamOutput(List<String> cmd) async { Future<int> runCommandAndStreamOutput(List<String> cmd,
{String prefix: ''}) async {
_logging.info(cmd.join(' ')); _logging.info(cmd.join(' '));
Process proc = Process proc =
await Process.start(cmd[0], cmd.getRange(1, cmd.length).toList()); await Process.start(cmd[0], cmd.getRange(1, cmd.length).toList());
proc.stdout.transform(UTF8.decoder).listen((data) { proc.stdout.transform(UTF8.decoder).listen((data) {
stdout.write(data); stdout.write('$prefix${data.trimRight().split('\n').join('\n$prefix')}\n');
}); });
proc.stderr.transform(UTF8.decoder).listen((data) { proc.stderr.transform(UTF8.decoder).listen((data) {
stderr.write(data); stderr.write('$prefix${data.trimRight().split('\n').join('\n$prefix')}\n');
}); });
return proc.exitCode; return proc.exitCode;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment