LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志优化

Browse Source
This commit is contained in:
MaxKey
2023-08-19 11:44:05 +08:00
parent e35af238ce
commit 6d11ee4e9c
6 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java
View File

@@ -63,7 +63,7 @@ public class SynchronizerAutoConfiguration implements InitializingBean {
if(synchronizer.getScheduler()!=null if(synchronizer.getScheduler()!=null
&& !synchronizer.getScheduler().equals("") && !synchronizer.getScheduler().equals("")
&& CronExpression.isValidExpression(synchronizer.getScheduler())) { && CronExpression.isValidExpression(synchronizer.getScheduler())) {
_logger.debug("synchronizer details : " + synchronizer); _logger.debug("synchronizer details : {}" , synchronizer);
buildJob(scheduler,synchronizer); buildJob(scheduler,synchronizer);
} }
} }
@@ -81,9 +81,9 @@ public class SynchronizerAutoConfiguration implements InitializingBean {
JobDataMap jobDataMap = new JobDataMap(); JobDataMap jobDataMap = new JobDataMap();
jobDataMap.put("synchronizer", synchronizer); jobDataMap.put("synchronizer", synchronizer);
_logger.debug("synchronizer : " + synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")"); _logger.debug("synchronizer : {}" , synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")");
_logger.debug("synchronizer service : " + synchronizer.getService()); _logger.debug("synchronizer service : {}", synchronizer.getService());
_logger.debug("synchronizer Scheduler : " + synchronizer.getScheduler()); _logger.debug("synchronizer Scheduler : {} " ,synchronizer.getScheduler());
CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(synchronizer.getScheduler()); CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(synchronizer.getScheduler());
CronTrigger cronTrigger = CronTrigger cronTrigger =
TriggerBuilder.newTrigger() TriggerBuilder.newTrigger()
@@ -95,7 +95,7 @@ public class SynchronizerAutoConfiguration implements InitializingBean {
} }
public List<Synchronizers> querySynchronizers(JdbcTemplate jdbcTemplate) { public List<Synchronizers> querySynchronizers(JdbcTemplate jdbcTemplate) {
List<Synchronizers> synchronizerList = jdbcTemplate.query(SYNCHRONIZERS_SELECT_STATEMENT, new RowMapper<Synchronizers>() { return jdbcTemplate.query(SYNCHRONIZERS_SELECT_STATEMENT, new RowMapper<Synchronizers>() {
public Synchronizers mapRow(ResultSet rs, int rowNum) throws SQLException { public Synchronizers mapRow(ResultSet rs, int rowNum) throws SQLException {
Synchronizers synchronizer = new Synchronizers(); Synchronizers synchronizer = new Synchronizers();
synchronizer.setId( rs.getString("id")); synchronizer.setId( rs.getString("id"));
@@ -125,8 +125,6 @@ public class SynchronizerAutoConfiguration implements InitializingBean {
return synchronizer; return synchronizer;
} }
}); });
return synchronizerList;
} }
@Override @Override

4
maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java
View File

@@ -74,11 +74,11 @@ public abstract class AbstractSynchronizerService {
} }
} }
orgsNamePathMap =new HashMap<String,Organizations>(); orgsNamePathMap =new HashMap<>();
orgsNamePathMap.put(rootOrganization.getNamePath(), rootOrganization); orgsNamePathMap.put(rootOrganization.getNamePath(), rootOrganization);
push(orgsNamePathMap,orgsList,rootOrganization); push(orgsNamePathMap,orgsList,rootOrganization);
_logger.trace("orgsNamePathMap " + orgsNamePathMap); _logger.trace("orgsNamePathMap {}" , orgsNamePathMap);
return orgsNamePathMap; return orgsNamePathMap;
} }

20
maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java
View File

@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class SynchronizerJob implements Job { public class SynchronizerJob implements Job {
final static Logger _logger = LoggerFactory.getLogger(SynchronizerJob.class); static final Logger logger = LoggerFactory.getLogger(SynchronizerJob.class);
SynchronizersService synchronizersService; SynchronizersService synchronizersService;
@@ -47,27 +47,27 @@ public class SynchronizerJob implements Job {
//init //init
jobStatus.put(synchronizer.getId(), JOBSTATUS.STOP) ; jobStatus.put(synchronizer.getId(), JOBSTATUS.STOP) ;
}else if(jobStatus.get(synchronizer.getId())== JOBSTATUS.RUNNING) { }else if(jobStatus.get(synchronizer.getId())== JOBSTATUS.RUNNING) {
_logger.info("SynchronizerJob is in running . " ); logger.info("SynchronizerJob is in running . " );
return; return;
} }
_logger.debug("SynchronizerJob is running ... " ); logger.debug("SynchronizerJob is running ... " );
jobStatus.put(synchronizer.getId(), JOBSTATUS.RUNNING) ; jobStatus.put(synchronizer.getId(), JOBSTATUS.RUNNING) ;
try { try {
_logger.debug("synchronizer : " + synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")"); logger.debug("synchronizer : {}" , synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")");
_logger.debug("synchronizer service : " + synchronizer.getService()); logger.debug("synchronizer service : {}" , synchronizer.getService());
_logger.debug("synchronizer Scheduler : " + synchronizer.getScheduler()); logger.debug("synchronizer Scheduler : {}" , synchronizer.getScheduler());
ISynchronizerService service = (ISynchronizerService)WebContext.getBean(synchronizer.getService()); ISynchronizerService service = (ISynchronizerService)WebContext.getBean(synchronizer.getService());
service.setSynchronizer(synchronizer); service.setSynchronizer(synchronizer);
service.sync(); service.sync();
jobStatus.put(synchronizer.getId(), JOBSTATUS.FINISHED); jobStatus.put(synchronizer.getId(), JOBSTATUS.FINISHED);
_logger.debug("SynchronizerJob is success " ); logger.debug("SynchronizerJob is success " );
}catch(Exception e) { }catch(Exception e) {
_logger.error("Exception " ,e); logger.error("Exception " ,e);
jobStatus.put(synchronizer.getId(), JOBSTATUS.STOP); jobStatus.put(synchronizer.getId(), JOBSTATUS.STOP);
} }
_logger.debug("SynchronizerJob is finished . " ); logger.debug("SynchronizerJob is finished . " );
} }
@@ -78,7 +78,7 @@ public class SynchronizerJob implements Job {
} }
//read synchronizer by id from database //read synchronizer by id from database
Synchronizers synchronizer = synchronizersService.get(jobSynchronizer.getId()); Synchronizers synchronizer = synchronizersService.get(jobSynchronizer.getId());
_logger.trace("synchronizer " + synchronizer); logger.trace("synchronizer {}" , synchronizer);
return synchronizer; return synchronizer;
} }

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java
View File

@@ -30,7 +30,7 @@ public class DynamicRolesListenerAdapter extends ListenerAdapter implements Job
private static final long serialVersionUID = 8831626240807856084L; private static final long serialVersionUID = 8831626240807856084L;
private static RolesService rolesService = null; private RolesService rolesService = null;
@Override @Override
public void execute(JobExecutionContext context){ public void execute(JobExecutionContext context){

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java
View File

@@ -33,7 +33,7 @@ public class ListenerAdapter {
JobExecutionContext context; JobExecutionContext context;
public final static class JOBSTATUS{ public static final class JOBSTATUS{
public static int STOP = 0; public static int STOP = 0;
public static int RUNNING = 1; public static int RUNNING = 1;
public static int ERROR = 2; public static int ERROR = 2;

1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java
View File

@@ -20,6 +20,7 @@ package org.dromara.maxkey.listener;
import org.quartz.JobDataMap; import org.quartz.JobDataMap;
public class ListenerParameter { public class ListenerParameter {
JobDataMap parameters ; JobDataMap parameters ;
public ListenerParameter() { public ListenerParameter() {