Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,7 @@ static class FallbackHandler implements GrpcExceptionHandler {
public @Nullable StatusException handleException(Throwable exception) {
StatusException status = this.exceptionHandler.handleException(exception);
if (status == null) {
if (logger.isDebugEnabled()) {
logger.error("Unknown exception", exception);
}
logger.error("Unknown exception", exception);
return Status.fromThrowable(exception).asException();
}
return status;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.util.ArrayList;
import java.util.List;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;

import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

Expand Down Expand Up @@ -54,6 +60,43 @@ void testNullStatusHandled() {
.isNotNull();
}

@Test
void unknownExceptionIsLoggedWhenNoHandlerMatches() {
java.util.logging.Logger logger = java.util.logging.Logger
.getLogger("org.springframework.grpc.server.exception.GrpcExceptionHandlerInterceptor$FallbackHandler");
List<LogRecord> records = new ArrayList<>();
Handler handler = new Handler() {
@Override
public void publish(LogRecord record) {
records.add(record);
}

@Override
public void flush() {
}

@Override
public void close() {
}
};
Level previousLevel = logger.getLevel();
boolean useParentHandlers = logger.getUseParentHandlers();
logger.setLevel(Level.ALL);
logger.setUseParentHandlers(false);
logger.addHandler(handler);
try {
new FallbackHandler(exception -> null).handleException(new RuntimeException("Test exception"));
}
finally {
logger.removeHandler(handler);
logger.setUseParentHandlers(useParentHandlers);
logger.setLevel(previousLevel);
}
assertThat(records).anySatisfy((record) -> {
assertThat(record.getMessage()).isEqualTo("Unknown exception");
});
}

@Test
void propagatesTrailersFromStatusExceptionWhenStartCallThrows() {
Status statusWithDetails = Status.newBuilder()
Expand Down
Loading