|
66 | 66 | import com.google.devtools.build.lib.server.FailureDetails;
|
67 | 67 | import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
|
68 | 68 | import com.google.devtools.build.lib.util.ExitCode;
|
69 |
| -import com.google.devtools.build.lib.util.io.FileOutErr; |
70 | 69 | import com.google.devtools.build.lib.vfs.Path;
|
71 | 70 | import com.google.devtools.build.lib.vfs.PathFragment;
|
72 | 71 | import com.google.longrunning.Operation;
|
@@ -274,7 +273,7 @@ public SpawnResult exec(Spawn spawn, SpawnExecutionContext context)
|
274 | 273 | // It's already late at this stage, but we should at least report once.
|
275 | 274 | reporter.reportExecutingIfNot();
|
276 | 275 |
|
277 |
| - maybePrintExecutionMessages(context, result.getMessage(), result.success()); |
| 276 | + maybePrintExecutionMessages(spawn, result.getMessage(), result.success()); |
278 | 277 |
|
279 | 278 | profileAccounting(result.getExecutionMetadata());
|
280 | 279 | spawnMetricsAccounting(spawnMetrics, result.getExecutionMetadata());
|
@@ -445,14 +444,16 @@ public boolean handlesCaching() {
|
445 | 444 | return true;
|
446 | 445 | }
|
447 | 446 |
|
448 |
| - private void maybePrintExecutionMessages( |
449 |
| - SpawnExecutionContext context, String message, boolean success) { |
450 |
| - FileOutErr outErr = context.getFileOutErr(); |
| 447 | + private void maybePrintExecutionMessages(Spawn spawn, String message, boolean success) { |
451 | 448 | boolean printMessage =
|
452 | 449 | remoteOptions.remotePrintExecutionMessages.shouldPrintMessages(success)
|
453 | 450 | && !message.isEmpty();
|
454 | 451 | if (printMessage) {
|
455 |
| - outErr.printErr(message + "\n"); |
| 452 | + report( |
| 453 | + Event.info( |
| 454 | + String.format( |
| 455 | + "Remote execution message for %s %s: %s", |
| 456 | + spawn.getMnemonic(), spawn.getTargetLabel(), message))); |
456 | 457 | }
|
457 | 458 | }
|
458 | 459 |
|
@@ -533,7 +534,8 @@ private SpawnResult handleError(
|
533 | 534 | }
|
534 | 535 | }
|
535 | 536 | if (e.isExecutionTimeout()) {
|
536 |
| - maybePrintExecutionMessages(context, e.getResponse().getMessage(), /* success = */ false); |
| 537 | + maybePrintExecutionMessages( |
| 538 | + action.getSpawn(), e.getResponse().getMessage(), /* success= */ false); |
537 | 539 | return new SpawnResult.Builder()
|
538 | 540 | .setRunnerName(getName())
|
539 | 541 | .setStatus(Status.TIMEOUT)
|
|
0 commit comments