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

[flutter_tools] create NotifyingLogger at the top level when running flutter run --machine or flutter attach --machine (#59087)

Browse Source 
Removes dependency on injecting additional logger with zones
This commit is contained in:
Jonah Williams 2020-06-09 15:39:27 -07:00 committed by GitHub
parent afe8bf7c4d
commit d911eadf95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/executable.dart
View File

@ -65,7 +65,9 @@ Future<void> main(List<String> args) async {
(args.isNotEmpty && args.first == 'help') || (args.length == 1 && verbose);
final bool muteCommandLogging = help || doctor;
final bool verboseHelp = help && verbose;
final bool daemon = args.contains('daemon');
final bool daemon = args.contains('daemon') ||
(args.contains('--machine') && args.contains('run')) ||
(args.contains('--machine') && args.contains('attach'));
await runner.run(args, () => <FlutterCommand>[
AnalyzeCommand(

7
packages/flutter_tools/lib/src/base/logger.dart
View File

@ -783,6 +783,13 @@ class SilentStatus extends Status {
timeoutConfiguration: timeoutConfiguration,
stopwatch: stopwatch,
);
@override
void finish() {
if (onFinish != null) {
onFinish();
}
}
}
/// Constructor writes [message] to [stdout]. On [cancel] or [stop], will call

4
packages/flutter_tools/lib/src/commands/attach.dart
View File

@ -207,7 +207,9 @@ class AttachCommand extends FlutterCommand {
? Daemon(
stdinCommandStream,
stdoutCommandResponse,
notifyingLogger: NotifyingLogger(verbose: globals.logger.isVerbose),
notifyingLogger: (globals.logger is NotifyingLogger)
? globals.logger as NotifyingLogger
: NotifyingLogger(verbose: globals.logger.isVerbose),
logToStdout: true,
)
: null;

4
packages/flutter_tools/lib/src/commands/run.dart
View File

@ -415,7 +415,9 @@ class RunCommand extends RunCommandBase {
final Daemon daemon = Daemon(
stdinCommandStream,
stdoutCommandResponse,
notifyingLogger: NotifyingLogger(verbose: globals.logger.isVerbose),
notifyingLogger: (globals.logger is NotifyingLogger)
? globals.logger as NotifyingLogger
: NotifyingLogger(verbose: globals.logger.isVerbose),
logToStdout: true,
);
AppInstance app;

22
packages/flutter_tools/test/integration.shard/command_output_test.dart
View File

@ -35,4 +35,26 @@ void main() {
// Only printed by verbose tool.
expect(result.stdout, isNot(contains('exiting with code 0')));
});
test('flutter run --machine uses NotifyingLogger', () async {
final String flutterBin = globals.fs.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await const LocalProcessManager().run(<String>[
flutterBin,
'run',
'--machine',
]);
expect(result.stdout, isEmpty);
});
test('flutter attach --machine uses NotifyingLogger', () async {
final String flutterBin = globals.fs.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await const LocalProcessManager().run(<String>[
flutterBin,
'attach',
'--machine',
]);
expect(result.stdout, isEmpty);
});
}