Rename all logger instances to "logger" (instead "LOG" or "log").
RELNOTES: None.
PiperOrigin-RevId: 167505493
diff --git a/src/main/java/com/google/devtools/build/lib/shell/Command.java b/src/main/java/com/google/devtools/build/lib/shell/Command.java
index 8413441..46eefee 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Command.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Command.java
@@ -113,8 +113,8 @@
*/
public final class Command {
- private static final Logger log =
- Logger.getLogger("com.google.devtools.build.lib.shell.Command");
+ private static final Logger logger =
+ Logger.getLogger("com.google.devtools.build.lib.shell.Command");
/** Pass this value to {@link #execute} to indicate that no input should be written to stdin. */
public static final InputStream NO_INPUT = new NullInputStream();
@@ -408,8 +408,8 @@
}
private static void processInput(InputStream stdinInput, Subprocess process) {
- if (log.isLoggable(Level.FINER)) {
- log.finer(stdinInput.toString());
+ if (logger.isLoggable(Level.FINER)) {
+ logger.finer(stdinInput.toString());
}
try (OutputStream out = process.getOutputStream()) {
ByteStreams.copy(stdinInput, out);
@@ -428,11 +428,11 @@
private CommandResult waitForProcessToComplete(
Subprocess process, Consumers.OutErrConsumers outErr, boolean killSubprocessOnInterrupt)
throws AbnormalTerminationException {
- log.finer("Waiting for process...");
+ logger.finer("Waiting for process...");
TerminationStatus status = waitForProcess(process, killSubprocessOnInterrupt);
- log.finer(status.toString());
+ logger.finer(status.toString());
try {
if (Thread.currentThread().isInterrupted()) {
@@ -498,9 +498,9 @@
}
private void logCommand() {
- if (!log.isLoggable(Level.FINE)) {
+ if (!logger.isLoggable(Level.FINE)) {
return;
}
- log.fine(toDebugString());
+ logger.fine(toDebugString());
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
index a682779..24e0947 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
@@ -26,8 +26,8 @@
*/
public final class CommandResult {
- private static final Logger log =
- Logger.getLogger("com.google.devtools.build.lib.shell.Command");
+ private static final Logger logger =
+ Logger.getLogger("com.google.devtools.build.lib.shell.Command");
private static final byte[] NO_BYTES = new byte[0];
@@ -90,16 +90,16 @@
}
void logThis() {
- if (!log.isLoggable(Level.FINER)) {
+ if (!logger.isLoggable(Level.FINER)) {
return;
}
- log.finer(terminationStatus.toString());
+ logger.finer(terminationStatus.toString());
if (stdout == NO_OUTPUT_COLLECTED) {
return;
}
- log.finer("Stdout: " + LogUtil.toTruncatedString(stdout.toByteArray()));
- log.finer("Stderr: " + LogUtil.toTruncatedString(stderr.toByteArray()));
+ logger.finer("Stdout: " + LogUtil.toTruncatedString(stdout.toByteArray()));
+ logger.finer("Stderr: " + LogUtil.toTruncatedString(stderr.toByteArray()));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/shell/Consumers.java b/src/main/java/com/google/devtools/build/lib/shell/Consumers.java
index b3864d3..94e2d74 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Consumers.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Consumers.java
@@ -37,8 +37,8 @@
*/
final class Consumers {
- private static final Logger log =
- Logger.getLogger("com.google.devtools.build.lib.shell.Command");
+ private static final Logger logger =
+ Logger.getLogger("com.google.devtools.build.lib.shell.Command");
private Consumers() {}
@@ -137,7 +137,7 @@
@Override
public void logConsumptionStrategy() {
- log.finer("Output will be sent to streams provided by client");
+ logger.finer("Output will be sent to streams provided by client");
}
@Override protected Runnable createConsumingAndClosingSink(InputStream in,
@@ -161,7 +161,7 @@
@Override
public void logConsumptionStrategy() {
- log.finer("Output will be accumulated (promptly read off) and returned");
+ logger.finer("Output will be accumulated (promptly read off) and returned");
}
@Override public Runnable createConsumingAndClosingSink(InputStream in, boolean closeConsumer) {
@@ -183,7 +183,7 @@
@Override
public void logConsumptionStrategy() {
- log.finer("Output will be ignored");
+ logger.finer("Output will be ignored");
}
@Override public Runnable createConsumingAndClosingSink(InputStream in, boolean closeConsumer) {
@@ -325,7 +325,7 @@
closeable.close();
} catch (IOException ioe) {
String message = "Unexpected exception while closing input stream";
- log.log(Level.WARNING, message, ioe);
+ logger.log(Level.WARNING, message, ioe);
}
}
