diff options
| author | wangkuan <[email protected]> | 2020-10-09 10:03:39 +0800 |
|---|---|---|
| committer | wangkuan <[email protected]> | 2020-10-09 10:03:39 +0800 |
| commit | 4cb6834024c049b0cbc8ea7be94b93e41227de25 (patch) | |
| tree | 8fde04381b410aaf9476cee5ac1631def4324c45 | |
| parent | 7612071ac6cd7555f0a52cbcab45c3d341a3fc2e (diff) | |
完善日志输出
4 files changed, 3 insertions, 7 deletions
@@ -10,7 +10,7 @@ </parent> <groupId>com.mesa</groupId> <artifactId>galaxy-report-service</artifactId> - <version>20.09.29</version> + <version>20.10.09</version> <name>galaxy-report-service</name> <description>Demo project for Spring Boot</description> @@ -219,7 +219,7 @@ <forceTags>true</forceTags> <imageTags> - <imageTag>20.09.29</imageTag> + <imageTag>20.10.09</imageTag> </imageTags> <!--远程docker构建，供dockerfile使用--> <dockerHost>http://192.168.40.153:2375</dockerHost> diff --git a/src/main/java/com/mesa/reportservice/controller/MonitorController.java b/src/main/java/com/mesa/reportservice/controller/MonitorController.java index 01f55a5..094e867 100644 --- a/src/main/java/com/mesa/reportservice/controller/MonitorController.java +++ b/src/main/java/com/mesa/reportservice/controller/MonitorController.java @@ -41,6 +41,7 @@ public class MonitorController { json = obj.toString(); } catch (Exception e) { logger.error(e.toString()); + json=e.toString(); } return json; diff --git a/src/main/java/com/mesa/reportservice/controller/ScheduledResultController.java b/src/main/java/com/mesa/reportservice/controller/ScheduledResultController.java index 048005e..c193e15 100644 --- a/src/main/java/com/mesa/reportservice/controller/ScheduledResultController.java +++ b/src/main/java/com/mesa/reportservice/controller/ScheduledResultController.java @@ -83,9 +83,6 @@ public class ScheduledResultController { } } int rows = GlobelConfig.job_thread - GlobelConfig.mapresult.size(); - for (Map.Entry<String, JobEntity> entry : GlobelConfig.mapresult.entrySet()) { - logger.info("----key = " + entry.getKey() + ", value = " + entry.getValue().getStatus()); - } if (rows > 0) { List<JobEntity> jobs = ms.getJobTask(rows); for (JobEntity job : jobs) { diff --git a/src/main/java/com/mesa/reportservice/service/impl/ExcuteserviceImpl.java b/src/main/java/com/mesa/reportservice/service/impl/ExcuteserviceImpl.java index 7b6d6a4..7109c93 100644 --- a/src/main/java/com/mesa/reportservice/service/impl/ExcuteserviceImpl.java +++ b/src/main/java/com/mesa/reportservice/service/impl/ExcuteserviceImpl.java @@ -54,7 +54,6 @@ public class ExcuteserviceImpl implements ExcuteService { job.setExcuteTime(0); job.setExcuteProcess(0); job.setResultRows(0); - //JobEntity jt = (JobEntity) job.clone(); GlobelConfig.mapresult.put(queryid, job); ms.updateProcesses(job); logger.info("execute queryid=" + queryid + " sql=" + sql + "mapresult size=" + GlobelConfig.mapresult.size()); @@ -80,7 +79,6 @@ public class ExcuteserviceImpl implements ExcuteService { Map mapresult = JSON.parseObject(hr.getBody()); Map rows = (Map) mapresult.get("statistics"); - // Integer resultrows = (Integer) rows.get("result_rows"); job.setResultRows(Integer.parseInt(rows.get("result_rows").toString())); job.setExcuteRow(Long.parseLong(rows.get("rows_read").toString())); job.setResult(hr.getBody()); |