Skip to content

[ISSUE #4733] ignore print some known exception stack log #4755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
li-keguo merged 6 commits into from
Jun 26, 2023
Merged

[ISSUE #4733] ignore print some known exception stack log #4755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5aa62cc
ignore print some known exception stack log
tomsun28 Jun 22, 2023
9ecabe4
Merge branch 'master' into ignore-known-exception-stack-log
tomsun28 Jun 22, 2023
2cc6e3b
Merge branch 'master' into ignore-known-exception-stack-log
yu199195 Jun 25, 2023
eeae3fd
Merge branch 'master' into ignore-known-exception-stack-log
tomsun28 Jun 25, 2023
08a5f2f
Merge branch 'master' into ignore-known-exception-stack-log
yu199195 Jun 26, 2023
97c056b
fix unit test error
tomsun28 Jun 26, 2023
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
33 changes: 16 additions & 17 deletions shenyu-admin/src/main/java/org/apache/shenyu/admin/exception/ExceptionHandlers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.util.StringUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
Expand Down Expand Up @@ -60,19 +61,6 @@ public ExceptionHandlers(final MessageSource messageSource) {
this.messageSource = messageSource;
}

@ExceptionHandler(Exception.class)
protected ShenyuAdminResult handleExceptionHandler(final Exception exception) {
LOG.error(exception.getMessage(), exception);
String message;
if (exception instanceof ShenyuException) {
ShenyuException shenyuException = (ShenyuException) exception;
message = shenyuException.getMessage();
} else {
message = "The system is busy, please try again later";
}
return ShenyuAdminResult.error(message);
}

@ExceptionHandler(DuplicateKeyException.class)
protected ShenyuAdminResult handleDuplicateKeyException(final DuplicateKeyException exception) {
LOG.error("duplicate key exception ", exception);
Expand Down Expand Up @@ -133,10 +121,21 @@ protected ShenyuAdminResult handleConstraintViolationException(final ConstraintV
.collect(Collectors.joining("| ")));
}

@ExceptionHandler(ShenyuAdminException.class)
protected ShenyuAdminResult handleShenyuException(final ShenyuAdminException exception) {
LOG.error("shenyu admin exception ", exception);
return ShenyuAdminResult.error(CommonErrorCode.ERROR, exception.getMessage());
@ExceptionHandler(ShenyuException.class)
protected ShenyuAdminResult handleShenyuException(final ShenyuException exception) {
String message = exception.getCause() == null ? null : exception.getCause().getMessage();
if (!StringUtils.hasText(message)) {
message = exception.getMessage();
}
LOG.error(exception.getMessage());
return ShenyuAdminResult.error(message);
}

@ExceptionHandler(Exception.class)
protected ShenyuAdminResult handleExceptionHandler(final Exception exception) {
LOG.error(exception.getMessage(), exception);
String message = "The system is busy, please try again later";
return ShenyuAdminResult.error(message);
}

@ExceptionHandler(WebI18nException.class)
Expand Down
6 changes: 3 additions & 3 deletions shenyu-admin/src/test/java/org/apache/shenyu/admin/exception/ExceptionHandlersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ public void testServerExceptionHandlerByException() {

@Test
public void testServerExceptionHandlerByShenyuException() {
Exception shenyuException = new ShenyuException("Test shenyuException message!");
ShenyuAdminResult result = exceptionHandlersUnderTest.handleExceptionHandler(shenyuException);
ShenyuException shenyuException = new ShenyuException(new Throwable("Test shenyuException message!"));
ShenyuAdminResult result = exceptionHandlersUnderTest.handleShenyuException(shenyuException);
assertEquals(result.getCode().intValue(), CommonErrorCode.ERROR);
assertEquals(result.getMessage(), shenyuException.getMessage());
assertEquals(result.getMessage(), shenyuException.getCause().getMessage());
}

@Test
Expand Down