This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 4cf4775 [OPENMEETINGS-1907] cleanRoomFiles method is removed
4cf4775 is described below
commit 4cf47757bb8f832bd7dc19b376e660669a3d2063
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Jul 23 20:47:29 2018 +0700
[OPENMEETINGS-1907] cleanRoomFiles method is removed
---
.../service/quartz/scheduler/CleanupJob.java | 52 ----------------------
.../webapp/WEB-INF/classes/applicationContext.xml | 6 ---
.../openmeetings/service/quartz/TestJob.java | 1 -
3 files changed, 59 deletions(-)
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
index e05bda4..4ced109 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
@@ -25,18 +25,11 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
import java.io.File;
import java.util.List;
-import java.util.Map;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.math.NumberUtils;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.room.Whiteboard;
-import org.apache.openmeetings.db.dto.room.Whiteboards;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.db.manager.IStreamClientManager;
-import org.apache.openmeetings.db.manager.IWhiteboardManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,19 +38,14 @@ public class CleanupJob extends AbstractJob {
private static Logger log = LoggerFactory.getLogger(CleanupJob.class);
private long sessionTimeout = 30 * 60 * 1000L;
private long testSetupTimeout = 60 * 60 * 1000L; // 1 hour
- private long roomFilesTtl = 60 * 60 * 1000L; // 1 hour
private long resetHashTtl = 24 * 60 * 60 * 1000L; // 1 day
private long confLogTtl = 7 * 24 * 60 * 60 * 1000L; // 7 days
@Autowired
private SessiondataDao sessionDao;
@Autowired
- private IStreamClientManager streamClientManager;
- @Autowired
private UserDao userDao;
@Autowired
- private IWhiteboardManager wbManager;
- @Autowired
private ConferenceLogDao confLogDao;
public void setSessionTimeout(long sessionTimeout) {
@@ -68,10 +56,6 @@ public class CleanupJob extends AbstractJob {
this.testSetupTimeout = testSetupTimeout;
}
- public void setRoomFilesTtl(long roomFilesTtl) {
- this.roomFilesTtl = roomFilesTtl;
- }
-
public void setResetHashTtl(long resetHashTtl) {
this.resetHashTtl = resetHashTtl;
}
@@ -108,42 +92,6 @@ public class CleanupJob extends AbstractJob {
}
}
- public void cleanRoomFiles() {
- log.trace("CleanupJob.cleanRoomFiles");
- final long now = System.currentTimeMillis();
- if (!isInitComplete()) {
- return;
- }
- try {
- File[] folders =
getStreamsDir().listFiles(File::isDirectory);
- if (folders == null) {
- return;
- }
- for (File folder : folders) {
- Long roomId = null;
- if (NumberUtils.isCreatable(folder.getName())) {
- roomId = Long.valueOf(folder.getName());
- Whiteboards wbList =
wbManager.get(roomId);
- for (Map.Entry<Long, Whiteboard> e :
wbList.getWhiteboards().entrySet()) {
- if (!e.getValue().isEmpty()) {
- roomId = null;
- break;
- }
- }
- }
- if (roomId != null &&
streamClientManager.list(roomId).isEmpty()) {
- File[] files = folder.listFiles(fi ->
fi.isFile() && fi.lastModified() + roomFilesTtl < now);
- if (files != null && files.length > 0) {
- log.debug("Room files are too
old and no users in the room: {}", roomId);
-
FileUtils.deleteDirectory(folder);
- }
- }
- }
- } catch (Exception e) {
- log.error("Unexpected exception while processing tests
setup videous.", e);
- }
- }
-
public void cleanSessions() {
log.trace("CleanupJob.cleanSessions");
if (!isInitComplete()) {
diff --git
a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index 13bbdec..87cd338 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -62,11 +62,6 @@
p:targetObject-ref="cleanupJob"
p:targetMethod="cleanTestSetup" p:concurrent="false" />
<bean id="triggerCleanTestSetup"
class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"
p:jobDetail-ref="cleanTestSetupJobDetail"
p:startDelay="1800000" p:repeatInterval="1800000" />
- <!-- room files clean-up -->
- <bean id="cleanRoomFilesJobDetail"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"
- p:targetObject-ref="cleanupJob"
p:targetMethod="cleanRoomFiles" p:concurrent="false" />
- <bean id="triggerCleanRoomFiles"
class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"
- p:jobDetail-ref="cleanRoomFilesJobDetail"
p:startDelay="10000" p:repeatInterval="1800000" />
<!-- expired recordings clean-up -->
<bean id="cleanExpiredRecJobDetails"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"
p:targetObject-ref="cleanupJob"
p:targetMethod="cleanExpiredRecordings" p:concurrent="false" />
@@ -111,7 +106,6 @@
<list>
<ref bean="triggerCleanSessions" />
<ref bean="triggerCleanTestSetup" />
- <ref bean="triggerCleanRoomFiles" />
<ref bean="triggerCleanExpiredRec" />
<ref bean="triggerCleanExpiredResetHash" />
<ref bean="triggerCleanPersonalData" />
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
index 19dda78..0782e21 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
@@ -40,7 +40,6 @@ public class TestJob extends AbstractWicketTester {
setInitComplete(false);
cleanJob.cleanExpiredRecordings();
cleanJob.cleanExpiredResetHash();
- cleanJob.cleanRoomFiles();
cleanJob.cleanSessions();
cleanJob.cleanTestSetup();
