Skip to content

Commit 6148e12

Browse files
committed
Use PluginLogger for LaunchState
1 parent 33e09ba commit 6148e12

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/io/flutter/run/LaunchState.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@
4545
import io.flutter.FlutterConstants;
4646
import io.flutter.FlutterUtils;
4747
import io.flutter.dart.DartPlugin;
48+
import io.flutter.logging.PluginLogger;
4849
import io.flutter.run.bazel.BazelRunConfig;
4950
import io.flutter.run.common.RunMode;
5051
import io.flutter.run.daemon.DaemonConsoleView;
5152
import io.flutter.run.daemon.DeviceService;
5253
import io.flutter.run.daemon.FlutterApp;
54+
import io.flutter.settings.FlutterSettings;
5355
import io.flutter.toolwindow.ToolWindowBadgeUpdater;
5456
import org.jetbrains.annotations.NotNull;
5557
import org.jetbrains.annotations.Nullable;
@@ -180,7 +182,11 @@ protected RunContentDescriptor launch(@NotNull ExecutionEnvironment env) throws
180182
}
181183
}
182184
catch (IllegalAccessException | InvocationTargetException | NoSuchFieldException | NoSuchMethodException e) {
183-
LOG.info(e);
185+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
186+
LOG.info(e);
187+
} else {
188+
LOG.info(e.toString());
189+
}
184190
}
185191

186192
return descriptor;
@@ -401,7 +407,11 @@ protected RunContentDescriptor doExecute(@NotNull RunProfileState state, @NotNul
401407
app.shutdownAsync().get();
402408
}
403409
catch (InterruptedException | java.util.concurrent.ExecutionException e) {
404-
FlutterUtils.warn(LOG, e);
410+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
411+
LOG.warn(e);
412+
} else {
413+
LOG.warn(e.toString());
414+
}
405415
}
406416
return launchState.launch(env);
407417
}
@@ -458,5 +468,5 @@ public static ProcessHandler getRunningAppProcess(@NotNull RunConfig config) {
458468

459469
private static final Key<RunConfig> FLUTTER_RUN_CONFIG_KEY = new Key<>("FLUTTER_RUN_CONFIG_KEY");
460470

461-
private static final @NotNull Logger LOG = Logger.getInstance(LaunchState.class);
471+
private static final @NotNull Logger LOG = PluginLogger.createLogger(LaunchState.class);
462472
}

0 commit comments

Comments
 (0)