zhourui 5 лет назад
Родитель
Сommit
cd9fb1de34

+ 3 - 2
o2server/x_program_center/src/main/java/com/x/program/center/schedule/Cleanup.java

@@ -22,7 +22,7 @@ public class Cleanup extends BaseAction {
 
 	private List<Class<? extends JpaObject>> list = new ArrayList<>();
 
-	private int tag = 0;
+	private volatile int tag = 0;
 
 	public Cleanup() {
 		list.add(ScheduleLog.class);
@@ -35,7 +35,8 @@ public class Cleanup extends BaseAction {
 	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
 		try {
 			if (pirmaryCenter()) {
-				ThisApplication.logQueue.send(new NameValuePair(list.get((tag++) % list.size()).getName(), null));
+				ThisApplication.logQueue.send(new NameValuePair(list.get(tag).getName(), null));
+				tag = (tag + 1) % list.size();
 			}
 		} catch (Exception e) {
 			logger.error(e);

+ 0 - 27
o2server/x_program_center/src/main/java/com/x/program/center/schedule/CleanupPromptErrorLog.java

@@ -1,27 +0,0 @@
-package com.x.program.center.schedule;
-
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import com.x.base.core.project.bean.NameValuePair;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.program.center.ThisApplication;
-import com.x.program.center.core.entity.PromptErrorLog;
-
-public class CleanupPromptErrorLog extends BaseAction {
-
-	private static Logger logger = LoggerFactory.getLogger(CleanupPromptErrorLog.class);
-
-	@Override
-	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-		try {
-			if (pirmaryCenter()) {
-				ThisApplication.logQueue.send(new NameValuePair(PromptErrorLog.class.getName(), null));
-			}
-		} catch (Exception e) {
-			logger.error(e);
-			throw new JobExecutionException(e);
-		}
-	}
-}

+ 0 - 28
o2server/x_program_center/src/main/java/com/x/program/center/schedule/CleanupUnexpectedErrorLog.java

@@ -1,28 +0,0 @@
-package com.x.program.center.schedule;
-
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import com.x.base.core.project.bean.NameValuePair;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.program.center.ThisApplication;
-import com.x.program.center.core.entity.UnexpectedErrorLog;
-
-public class CleanupUnexpectedErrorLog extends BaseAction {
-
-	private static Logger logger = LoggerFactory.getLogger(CleanupUnexpectedErrorLog.class);
-
-	@Override
-	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-		try {
-			if (pirmaryCenter()) {
-				ThisApplication.logQueue.send(new NameValuePair(UnexpectedErrorLog.class.getName(), null));
-			}
-		} catch (Exception e) {
-			logger.error(e);
-			throw new JobExecutionException(e);
-		}
-	}
-
-}

+ 0 - 27
o2server/x_program_center/src/main/java/com/x/program/center/schedule/CleanupWarnLog.java

@@ -1,27 +0,0 @@
-package com.x.program.center.schedule;
-
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-import com.x.base.core.project.bean.NameValuePair;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.program.center.ThisApplication;
-import com.x.program.center.core.entity.WarnLog;
-
-public class CleanupWarnLog extends BaseAction {
-
-	private static Logger logger = LoggerFactory.getLogger(CleanupWarnLog.class);
-
-	@Override
-	public void execute(JobExecutionContext arg0) throws JobExecutionException {
-		try {
-			if (pirmaryCenter()) {
-				ThisApplication.logQueue.send(new NameValuePair(WarnLog.class.getName(), null));
-			}
-		} catch (Exception e) {
-			logger.error(e);
-			throw new JobExecutionException(e);
-		}
-	}
-}