穿云 9 hónapja
szülő
commit
6c14ade2d7

+ 4 - 4
dbsyncer-biz/src/main/java/org/dbsyncer/biz/enums/MetricEnum.java

@@ -37,10 +37,10 @@ public enum MetricEnum {
      */
     MEMORY_MAX("jvm.memory.max", "内存", "总共"),
 
-    /**
-     * GC
-     */
-    GC_PAUSE("jvm.gc.pause", "GC", "已用"),
+//    /**
+//     * GC
+//     */
+//    GC_PAUSE("jvm.gc.pause", "GC", "已用"),
 
     /**
      * CPU已用

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MonitorServiceImpl.java

@@ -108,7 +108,7 @@ public class MonitorServiceImpl extends BaseServiceImpl implements MonitorServic
         metricDetailFormatterMap.putIfAbsent(MetricEnum.MEMORY_COMMITTED.getCode(), new MemoryMetricDetailFormatter());
         metricDetailFormatterMap.putIfAbsent(MetricEnum.MEMORY_MAX.getCode(), new MemoryMetricDetailFormatter());
         metricDetailFormatterMap.putIfAbsent(MetricEnum.CPU_USAGE.getCode(), new CpuMetricDetailFormatter());
-        metricDetailFormatterMap.putIfAbsent(MetricEnum.GC_PAUSE.getCode(), new GCMetricDetailFormatter());
+//        metricDetailFormatterMap.putIfAbsent(MetricEnum.GC_PAUSE.getCode(), new GCMetricDetailFormatter());
         metricDetailFormatterMap.putIfAbsent(DiskMetricEnum.THRESHOLD.getCode(), new DiskMetricDetailFormatter());
         metricDetailFormatterMap.putIfAbsent(DiskMetricEnum.FREE.getCode(), new DiskMetricDetailFormatter());
         metricDetailFormatterMap.putIfAbsent(DiskMetricEnum.TOTAL.getCode(), new DiskMetricDetailFormatter());

+ 10 - 7
dbsyncer-web/src/main/java/org/dbsyncer/web/controller/monitor/MonitorController.java

@@ -123,7 +123,7 @@ public class MonitorController extends BaseController {
             Map<String, String> params = getParams(request);
             return RestResult.restSuccess(monitorService.queryData(params));
         } catch (Exception e) {
-            logger.error(e.getLocalizedMessage(), e.getClass());
+            logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
         }
     }
@@ -135,7 +135,7 @@ public class MonitorController extends BaseController {
             Map<String, String> params = getParams(request);
             return RestResult.restSuccess(monitorService.queryLog(params));
         } catch (Exception e) {
-            logger.error(e.getLocalizedMessage(), e.getClass());
+            logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
         }
     }
@@ -147,7 +147,7 @@ public class MonitorController extends BaseController {
             Map<String, String> params = getParams(request);
             return RestResult.restSuccess(dataSyncService.sync(params));
         } catch (Exception e) {
-            logger.error(e.getLocalizedMessage(), e.getClass());
+            logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
         }
     }
@@ -158,7 +158,7 @@ public class MonitorController extends BaseController {
         try {
             return RestResult.restSuccess(monitorService.clearData(id));
         } catch (Exception e) {
-            logger.error(e.getLocalizedMessage(), e.getClass());
+            logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
         }
     }
@@ -169,7 +169,7 @@ public class MonitorController extends BaseController {
         try {
             return RestResult.restSuccess(monitorService.clearLog());
         } catch (Exception e) {
-            logger.error(e.getLocalizedMessage(), e.getClass());
+            logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
         }
     }
@@ -189,7 +189,7 @@ public class MonitorController extends BaseController {
             reportMetric.setMemory(memory);
             return RestResult.restSuccess(reportMetric);
         } catch (Exception e) {
-            logger.error(e.getLocalizedMessage(), e.getClass());
+            logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
         }
     }
@@ -200,7 +200,7 @@ public class MonitorController extends BaseController {
         try {
             return RestResult.restSuccess(systemConfigService.getSystemConfig().getRefreshIntervalSeconds());
         } catch (Exception e) {
-            logger.error(e.getLocalizedMessage(), e.getClass());
+            logger.error(e.getLocalizedMessage(), e);
             return RestResult.restFail(e.getMessage());
         }
     }
@@ -229,6 +229,9 @@ public class MonitorController extends BaseController {
 
     private MetricResponse getMetricResponse(String code) {
         MetricsEndpoint.MetricResponse metric = metricsEndpoint.metric(code, null);
+        if (metric == null) {
+            throw new IllegalArgumentException("不支持指标=" + code);
+        }
         MetricResponse metricResponse = new MetricResponse();
         MetricEnum metricEnum = MetricEnum.getMetric(metric.getName());
         metricResponse.setCode(metricEnum.getCode());