Skip to content

Commit 06890ea

Browse files
committed
Simplify GrpcClient stream error logging logic a little
1 parent 2427f82 commit 06890ea

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

src/main/java/com/ibm/etcd/client/GrpcClient.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -619,24 +619,22 @@ public void onError(Throwable t) {
619619
}
620620
if (!finalError) {
621621
int errCount = -1;
622+
String msg;
622623
if (reauthed) {
623-
String msg = "Reauthenticating after auth error (likely expiry) on underlying"
624+
msg = "Reauthenticating after auth error (likely expiry) on underlying"
624625
+ " stream of method " + method.getFullMethodName();
625-
if (logger.isDebugEnabled()) {
626-
logger.info(msg, t);
627-
} else {
628-
Throwable cause = Throwables.getRootCause(t);
629-
logger.info(msg + ": " + cause.getClass().getName() + ": " + cause.getMessage());
630-
}
631626
} else {
632627
errCount = ++errCounter;
633-
String msg = "Retryable onError #" + errCount
628+
msg = "Retryable onError #" + errCount
634629
+ " on underlying stream of method " + method.getFullMethodName();
635-
if (logger.isDebugEnabled()) {
636-
logger.info(msg, t);
637-
} else {
638-
logger.info(msg + ": " + t.getClass().getName() + ": " + t.getMessage());
630+
}
631+
if (logger.isDebugEnabled()) {
632+
logger.info(msg, t);
633+
} else {
634+
if (reauthed) {
635+
t = Throwables.getRootCause(t);
639636
}
637+
logger.info(msg + ": " + t.getClass().getName() + ": " + t.getMessage());
640638
}
641639

642640
RequestSubStream userStreamBefore = userReqStream;

0 commit comments

Comments
 (0)