You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/08/04 03:47:28 UTC

[shardingsphere-elasticjob-ui] branch master updated: Fixes data trace datasource

This is an automated email from the ASF dual-hosted git repository.

menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git


The following commit(s) were added to refs/heads/master by this push:
     new 12203ad  Fixes data trace datasource
     new b4d760a  Merge pull request #36 from menghaoranss/dev0804
12203ad is described below

commit 12203ad38c6f2f25dbb34aa3921d461c1d55e125
Author: menghaoranss <lo...@163.com>
AuthorDate: Tue Aug 4 11:42:20 2020 +0800

    Fixes data trace datasource
---
 .../EventTraceDataSourceConfigurationServiceImpl.java    | 16 +++++++++++++++-
 .../ui/web/controller/EventTraceHistoryController.java   | 12 ++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/EventTraceDataSourceConfigurationServiceImpl.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/EventTraceDataSourceConfigurationServiceImpl.java
index 31dc1c6..34a0c13 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/EventTraceDataSourceConfigurationServiceImpl.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/service/impl/EventTraceDataSourceConfigurationServiceImpl.java
@@ -25,6 +25,7 @@ import org.apache.shardingsphere.elasticjob.lite.ui.domain.GlobalConfiguration;
 import org.apache.shardingsphere.elasticjob.lite.ui.repository.ConfigurationsXmlRepository;
 import org.apache.shardingsphere.elasticjob.lite.ui.repository.impl.ConfigurationsXmlRepositoryImpl;
 import org.apache.shardingsphere.elasticjob.lite.ui.service.EventTraceDataSourceConfigurationService;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,7 +36,7 @@ import java.util.Optional;
  * Event trace data source configuration service implementation.
  */
 @Service
-public final class EventTraceDataSourceConfigurationServiceImpl implements EventTraceDataSourceConfigurationService {
+public final class EventTraceDataSourceConfigurationServiceImpl implements EventTraceDataSourceConfigurationService, InitializingBean {
     
     private ConfigurationsXmlRepository configurationsXmlRepository = new ConfigurationsXmlRepositoryImpl();
     
@@ -121,4 +122,17 @@ public final class EventTraceDataSourceConfigurationServiceImpl implements Event
         }
         return result;
     }
+    
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        loadGlobal().getEventTraceDataSourceConfigurations().getEventTraceDataSourceConfiguration().stream().forEach(each -> afterLoad(each));
+    }
+    
+    private void afterLoad(final EventTraceDataSourceConfiguration config) {
+        if (config.isActivated()) {
+            DataSource dataSource = DataSourceFactory.createDataSource(config);
+            dynamicDataSource.addDataSource(config.getName(), dataSource);
+            DynamicDataSourceConfig.DynamicDataSourceContextHolder.setDataSourceName(config.getName());
+        }
+    }
 }
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java
index 7d79f64..687d38e 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java
@@ -20,13 +20,17 @@ package org.apache.shardingsphere.elasticjob.lite.ui.web.controller;
 import org.apache.shardingsphere.elasticjob.lite.ui.dto.request.FindJobExecutionEventsRequest;
 import org.apache.shardingsphere.elasticjob.lite.ui.dto.request.FindJobStatusTraceEventsRequest;
 import org.apache.shardingsphere.elasticjob.lite.ui.dto.response.BasePageResponse;
+import org.apache.shardingsphere.elasticjob.lite.ui.service.EventTraceDataSourceConfigurationService;
 import org.apache.shardingsphere.elasticjob.lite.ui.service.EventTraceHistoryService;
+import org.apache.shardingsphere.elasticjob.lite.ui.util.SessionEventTraceDataSourceConfiguration;
 import org.apache.shardingsphere.elasticjob.lite.ui.web.response.ResponseResult;
 import org.apache.shardingsphere.elasticjob.lite.ui.web.response.ResponseResultUtil;
 import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent;
 import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent;
+import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,6 +46,9 @@ public final class EventTraceHistoryController {
     @Autowired
     private EventTraceHistoryService eventTraceHistoryService;
     
+    @Autowired
+    private EventTraceDataSourceConfigurationService eventTraceDataSourceConfigurationService;
+    
     /**
      * Find job execution events.
      *
@@ -65,4 +72,9 @@ public final class EventTraceHistoryController {
         Page<JobStatusTraceEvent> jobStatusTraceEvents = eventTraceHistoryService.findJobStatusTraceEvents(requestParams);
         return ResponseResultUtil.build(BasePageResponse.of(jobStatusTraceEvents));
     }
+    
+    @ModelAttribute
+    private void initDataSource() {
+        eventTraceDataSourceConfigurationService.loadActivated().ifPresent(config -> SessionEventTraceDataSourceConfiguration.setDataSourceConfiguration(config));
+    }
 }