diff options
Diffstat (limited to 'src/main')
7 files changed, 29 insertions, 29 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index 0ef3f8565e..9708f3eb8b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -264,7 +264,7 @@ public class BuildView { public boolean interleaveLoadingAndAnalysis; } - private static Logger LOG = Logger.getLogger(BuildView.class.getName()); + private static final Logger logger = Logger.getLogger(BuildView.class.getName()); private final BlazeDirectories directories; @@ -488,7 +488,7 @@ public class BuildView { ExtendedEventHandler eventHandler, EventBus eventBus) throws ViewCreationFailedException, InterruptedException { - LOG.info("Starting analysis"); + logger.info("Starting analysis"); pollInterruptedStatus(); skyframeBuildView.resetEvaluatedConfiguredTargetKeysSet(); @@ -614,7 +614,7 @@ public class BuildView { String msg = String.format("Analysis succeeded for only %d of %d top-level targets", numSuccessful, numTargetsToAnalyze); eventHandler.handle(Event.info(msg)); - LOG.info(msg); + logger.info(msg); } Set<ConfiguredTarget> targetsToSkip = @@ -631,7 +631,7 @@ public class BuildView { viewOptions, skyframeAnalysisResult, targetsToSkip); - LOG.info("Finished analysis"); + logger.info("Finished analysis"); return result; } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BugReport.java b/src/main/java/com/google/devtools/build/lib/runtime/BugReport.java index 0ff74cd9ed..61925fc8eb 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BugReport.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BugReport.java @@ -39,7 +39,7 @@ public abstract class BugReport { private BugReport() {} - private static Logger LOG = Logger.getLogger(BugReport.class.getName()); + private static final Logger logger = Logger.getLogger(BugReport.class.getName()); private static BlazeVersionInfo versionInfo = BlazeVersionInfo.instance(); @@ -66,7 +66,7 @@ public abstract class BugReport { */ public static void sendBugReport(Throwable exception, List<String> args, String... values) { if (!versionInfo.isReleasedBlaze()) { - LOG.info("(Not a released binary; not logged.)"); + logger.info("(Not a released binary; not logged.)"); return; } @@ -74,7 +74,7 @@ public abstract class BugReport { } private static void logCrash(Throwable throwable, String... args) { - LOG.severe("Crash: " + Throwables.getStackTraceAsString(throwable)); + logger.severe("Crash: " + Throwables.getStackTraceAsString(throwable)); BugReport.sendBugReport(throwable, Arrays.asList(args)); BugReport.printBug(OutErr.SYSTEM_OUT_ERR, throwable); System.err.println("ERROR: " + getProductName() + " crash in async thread:"); @@ -141,7 +141,7 @@ public abstract class BugReport { PrintStream err = new PrintStream(outErr.getErrorStream()); e.printStackTrace(err); err.flush(); - LOG.log(Level.SEVERE, getProductName() + " crashed", e); + logger.log(Level.SEVERE, getProductName() + " crashed", e); } /** @@ -182,7 +182,7 @@ public abstract class BugReport { // Log the exception. Because this method is only called in a blaze release, // this will result in a report being sent to a remote logging service. private static void logException(Throwable exception, List<String> args, String... values) { - LOG.severe("Exception: " + Throwables.getStackTraceAsString(exception)); + logger.severe("Exception: " + Throwables.getStackTraceAsString(exception)); // The preamble is used in the crash watcher, so don't change it // unless you know what you're doing. String preamble = getProductName() diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java index 5756cbdf3e..a3ae256d41 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java @@ -58,7 +58,7 @@ import java.util.logging.Logger; /** An experimental new output stream. */ public class ExperimentalEventHandler implements EventHandler { - private static Logger LOG = Logger.getLogger(ExperimentalEventHandler.class.getName()); + private static final Logger logger = Logger.getLogger(ExperimentalEventHandler.class.getName()); /** Latest refresh of the progress bar, if contents other than time changed */ static final long MAXIMAL_UPDATE_DELAY_MILLIS = 200L; /** Minimal rate limiting (in ms), if the progress bar cannot be updated in place */ @@ -254,7 +254,7 @@ public class ExperimentalEventHandler implements EventHandler { didFlush = true; } } catch (IOException e) { - LOG.warning("IO Error writing to output stream: " + e); + logger.warning("IO Error writing to output stream: " + e); } return didFlush; } @@ -392,7 +392,7 @@ public class ExperimentalEventHandler implements EventHandler { } } } catch (IOException e) { - LOG.warning("IO Error writing to output stream: " + e); + logger.warning("IO Error writing to output stream: " + e); } } @@ -596,7 +596,7 @@ public class ExperimentalEventHandler implements EventHandler { } terminal.flush(); } catch (IOException e) { - LOG.warning("IO Error writing to output stream: " + e); + logger.warning("IO Error writing to output stream: " + e); } } else { refresh(); @@ -673,7 +673,7 @@ public class ExperimentalEventHandler implements EventHandler { } } } catch (IOException e) { - LOG.warning("IO Error writing to output stream: " + e); + logger.warning("IO Error writing to output stream: " + e); } } } else { @@ -783,7 +783,7 @@ public class ExperimentalEventHandler implements EventHandler { try { terminal.resetTerminal(); } catch (IOException e) { - LOG.warning("IO Error writing to user terminal: " + e); + logger.warning("IO Error writing to user terminal: " + e); } } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java index 5996d3c6d0..e482eb6054 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/FancyTerminalEventHandler.java @@ -60,7 +60,7 @@ import java.util.regex.Pattern; * a choppy UI experience. */ public class FancyTerminalEventHandler extends BlazeCommandEventHandler { - private static Logger LOG = Logger.getLogger(FancyTerminalEventHandler.class.getName()); + private static final Logger logger = Logger.getLogger(FancyTerminalEventHandler.class.getName()); private static final Pattern progressPattern = Pattern.compile( // Match strings that look like they start with progress info: // [42%] Compiling base/base.cc @@ -232,7 +232,7 @@ public class FancyTerminalEventHandler extends BlazeCommandEventHandler { // should also kill the blaze client. So this isn't something that should // occur here; it will show up in the client/server interface as a broken // pipe. - LOG.warning("Terminal was closed during build: " + e); + logger.warning("Terminal was closed during build: " + e); terminalClosed = true; } } @@ -454,7 +454,7 @@ public class FancyTerminalEventHandler extends BlazeCommandEventHandler { try { terminal.resetTerminal(); } catch (IOException e) { - LOG.warning("IO Error writing to user terminal: " + e); + logger.warning("IO Error writing to user terminal: " + e); } } } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java index f908039dca..5121d4dd09 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java @@ -130,7 +130,7 @@ public final class CleanCommand implements BlazeCommand { } } - private static Logger LOG = Logger.getLogger(CleanCommand.class.getName()); + private static final Logger logger = Logger.getLogger(CleanCommand.class.getName()); @Override public ExitCode exec(CommandEnvironment env, OptionsProvider options) @@ -216,7 +216,7 @@ public final class CleanCommand implements BlazeCommand { "exec >&- 2>&- <&- && (/usr/bin/setsid /bin/rm -rf %s &)&", ShellEscaper.escapeString(tempPath.getPathString())); - LOG.info("Executing shell commmand " + ShellEscaper.escapeString(command)); + logger.info("Executing shell commmand " + ShellEscaper.escapeString(command)); // Doesn't throw iff command exited and was successful. new CommandBuilder() @@ -242,7 +242,7 @@ public final class CleanCommand implements BlazeCommand { } env.getBlazeWorkspace().clearCaches(); if (expunge) { - LOG.info("Expunging..."); + logger.info("Expunging..."); env.getRuntime().prepareForAbruptShutdown(); // Close java.log. LogManager.getLogManager().reset(); @@ -264,18 +264,18 @@ public final class CleanCommand implements BlazeCommand { FileSystemUtils.deleteTreesBelow(outputBase); FileSystemUtils.deleteTree(outputBase); } else if (expungeAsync) { - LOG.info("Expunging asynchronously..."); + logger.info("Expunging asynchronously..."); env.getRuntime().prepareForAbruptShutdown(); asyncClean(env, outputBase, "Output base"); } else { - LOG.info("Output cleaning..."); + logger.info("Output cleaning..."); env.getBlazeWorkspace().resetEvaluator(); // In order to be sure that we delete everything, delete the workspace directory both for // --deep_execroot and for --nodeep_execroot. for (String directory : new String[] {workspaceDirectory, "execroot"}) { Path child = outputBase.getRelative(directory); if (child.exists()) { - LOG.finest("Cleaning " + child + (async ? " asynchronously..." : "")); + logger.finest("Cleaning " + child + (async ? " asynchronously..." : "")); if (async) { asyncClean(env, child, "Output tree"); } else { diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java index 0cc2097bf0..0dd1b4d301 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java @@ -65,8 +65,8 @@ public final class GraphBackedRecursivePackageProvider implements RecursivePacka private final PathPackageLocator pkgPath; private final ImmutableList<TargetPatternKey> universeTargetPatternKeys; - private static final Logger LOGGER = Logger - .getLogger(GraphBackedRecursivePackageProvider.class.getName()); + private static final Logger logger = Logger.getLogger( + GraphBackedRecursivePackageProvider.class.getName()); public GraphBackedRecursivePackageProvider(WalkableGraph graph, ImmutableList<TargetPatternKey> universeTargetPatternKeys, @@ -113,7 +113,7 @@ public final class GraphBackedRecursivePackageProvider implements RecursivePacka SetView<SkyKey> unknownKeys = Sets.difference(pkgKeys, packages.keySet()); if (!Iterables.isEmpty(unknownKeys)) { - LOGGER.warning("Unable to find " + unknownKeys + " in the batch lookup of " + pkgKeys + logger.warning("Unable to find " + unknownKeys + " in the batch lookup of " + pkgKeys + ". Successfully looked up " + packages.keySet()); } for (Map.Entry<SkyKey, Exception> missingOrExceptionEntry : diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java index f05c5a424b..6a472b7839 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java @@ -86,7 +86,7 @@ import javax.annotation.Nullable; * <p>Covers enough functionality to work as a substitute for {@code BuildView#configureTargets}. */ public final class SkyframeBuildView { - private static Logger LOG = Logger.getLogger(BuildView.class.getName()); + private static final Logger logger = Logger.getLogger(BuildView.class.getName()); private final ConfiguredTargetFactory factory; private final ArtifactFactory artifactFactory; @@ -155,7 +155,7 @@ public final class SkyframeBuildView { // prevents unbounded memory usage. if ((this.configurations != null && !configurations.equals(this.configurations)) || skyframeAnalysisWasDiscarded) { - LOG.info("Discarding analysis cache: configurations have changed."); + logger.info("Discarding analysis cache: configurations have changed."); skyframeExecutor.dropConfiguredTargets(); } skyframeAnalysisWasDiscarded = false; |