diff --git a/.gitignore b/.gitignore index 84ee25c..31a0ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ micronaut-cli.yml .mvn/ mvnw mvnw.bat -.log +*.log ### STS ### .apt_generated diff --git a/RequestDemo.json b/RequestDemo.json index f630186..6a29452 100644 --- a/RequestDemo.json +++ b/RequestDemo.json @@ -22,7 +22,7 @@ "id": 87584674384, "monitorId": 875846754543, "type": 1, - "value": "80" + "value": "8088" }, { "field": "host", diff --git a/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java b/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java index a0ee3ff..c384d4f 100644 --- a/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java +++ b/manager/src/main/java/com/usthe/manager/support/GlobalExceptionHandler.java @@ -4,6 +4,7 @@ package com.usthe.manager.support; import com.usthe.common.entity.dto.Message; import com.usthe.manager.support.exception.MonitorDatabaseException; import com.usthe.manager.support.exception.MonitorDetectException; +import com.usthe.scheduler.ScheduleException; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DataAccessException; import org.springframework.http.HttpStatus; @@ -134,6 +135,23 @@ public class GlobalExceptionHandler { return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(message); } + /** + * 处理分发调度器异常问题 + * @param exception 调度器异常问题 + * @return response + */ + @ExceptionHandler(ScheduleException.class) + @ResponseBody + ResponseEntity> handleScheduleException(ScheduleException exception) { + String errorMessage = "scheduler warning"; + if (exception != null) { + errorMessage = exception.getMessage(); + } + log.warn("[scheduler warning]-{}", errorMessage); + Message message = Message.builder().msg(errorMessage).build(); + return ResponseEntity.status(HttpStatus.CONFLICT).body(message); + } + /** * handler the exception thrown for datastore error * @param exception datastore exception