diff options
author | 2015-08-04 03:47:04 +0000 | |
---|---|---|
committer | 2015-08-04 09:09:29 +0000 | |
commit | ae9b95f9f216d96d4caf775e5fd6f83bc6444042 (patch) | |
tree | 85527dcb760c385fa04b6cef4d942e2f4f1edd2d /src/main/java/com/google/devtools/build/lib/runtime | |
parent | e927532a03addbcdd1e716b8453b53d9c3eb98e1 (diff) |
Crash in tests if anybody tries to log remotely. Remote logging usually indicates an error, and tests shouldn't normally have such errors.
--
MOS_MIGRATED_REVID=99789434
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java index 8afb03a17c..8225fce736 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java @@ -30,6 +30,7 @@ import com.google.common.collect.Sets; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.SubscriberExceptionContext; import com.google.common.eventbus.SubscriberExceptionHandler; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Uninterruptibles; import com.google.devtools.build.lib.actions.PackageRootResolver; import com.google.devtools.build.lib.actions.cache.ActionCache; @@ -138,9 +139,12 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.UUID; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Handler; import java.util.logging.Level; +import java.util.logging.LogRecord; import java.util.logging.Logger; import java.util.regex.Pattern; @@ -1489,6 +1493,11 @@ public final class BlazeRuntime { ? new BlazeRuntime.BugReportingExceptionHandler() : new BlazeRuntime.RemoteExceptionHandler()); + if (System.getenv("TEST_TMPDIR") != null + && System.getenv("NO_CRASH_ON_LOGGING_IN_TEST") == null) { + LoggingUtil.installRemoteLogger(getTestCrashLogger()); + } + for (BlazeModule blazeModule : blazeModules) { runtimeBuilder.addBlazeModule(blazeModule); } @@ -1499,6 +1508,40 @@ public final class BlazeRuntime { } /** + * Returns a logger that crashes as soon as it's written to, since tests should not cause events + * that would be logged. + */ + @VisibleForTesting + public static Future<Logger> getTestCrashLogger() { + Logger crashLogger = Logger.getAnonymousLogger(); + crashLogger.addHandler( + new Handler() { + @Override + public void publish(LogRecord record) { + throw new IllegalStateException( + record.getSourceClassName() + + "#" + + record.getSourceMethodName() + + ": " + + record.getMessage() + + "\n" + + record.getThrown()); + } + + @Override + public void flush() { + throw new IllegalStateException(); + } + + @Override + public void close() { + throw new IllegalStateException(); + } + }); + return Futures.immediateFuture(crashLogger); + } + + /** * Make sure async threads cannot be orphaned. This method makes sure bugs are reported to * telemetry and the proper exit code is reported. */ |