mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 16:07:15 +02:00
Rationalize logging statements across codebase
This fixes up the following problems: 1. Using string concatenation instead of the formatting variant methods. 2. Logging or swallowing exception messages without logging the exception itself (this swallows the stack trace). 3. Unnecessary logging on re-thrown exceptions. 4. Unnecessary use of formatting variant methods when not necessary. 5. Complicated logging statements involving significant processing not being wrapped inside of a logging level check. 6. Redundant logging both of an exception itself and its message (this is unnecessary duplication). 7. Use of the base Logger class instead of our FormattingLogger class. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=182419837
This commit is contained in:
parent
f22a42cd42
commit
81dc2bbbc3
47 changed files with 172 additions and 154 deletions
|
@ -23,7 +23,6 @@ import java.net.InetAddress;
|
|||
import java.net.UnknownHostException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Iterator;
|
||||
import java.util.logging.Logger;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/**
|
||||
|
@ -41,8 +40,7 @@ import javax.annotation.Nullable;
|
|||
// TODO(b/21870796): Migrate to Guava version when this is open-sourced.
|
||||
public class CidrAddressBlock implements Iterable<InetAddress>, Serializable {
|
||||
|
||||
private static final Logger logger =
|
||||
Logger.getLogger(CidrAddressBlock.class.getName());
|
||||
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
|
||||
|
||||
private final InetAddress ip;
|
||||
|
||||
|
@ -338,13 +336,13 @@ public class CidrAddressBlock implements Iterable<InetAddress>, Serializable {
|
|||
|
||||
try {
|
||||
return ip.equals(applyNetmask(ipAddr, netmask));
|
||||
} catch (IllegalArgumentException iae) {
|
||||
} catch (IllegalArgumentException e) {
|
||||
|
||||
// Something has gone very wrong. This CidrAddressBlock should
|
||||
// not have been created with an invalid netmask and a valid
|
||||
// netmask should have been successfully applied to "ipAddr" as long
|
||||
// as it represents an address of the same family as "this.ip".
|
||||
logger.warning(iae.getMessage());
|
||||
logger.warning(e, "Error while applying netmask.");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue