zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed cache cleanup

Browse source
This commit is contained in:
anhefti 2021-05-18 12:02:27 +02:00
parent a9fef7d136
commit 7a686c0e6e
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/AbstractCachedCourseAccess.java
View file

@ -9,6 +9,8 @@
package ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,10 +49,31 @@ public abstract class AbstractCachedCourseAccess extends AbstractCourseAccess {
/** Used to clear the entire cache */
public void clearCache() {
final Object nativeCache = this.cache.getNativeCache();
// if (nativeCache instanceof Eh107Cache) {
//
// }
this.cache.clear();
if (nativeCache instanceof javax.cache.Cache) {
try {
final String suffix = Constants.UNDERLINE.toString() + getLmsSetupId();
final Set<String> keysToRemove = new HashSet<>();
@SuppressWarnings({ "unchecked" })
final javax.cache.Cache<String, QuizData> _cache =
(javax.cache.Cache<String, QuizData>) this.cache.getNativeCache();
for (final javax.cache.Cache.Entry<String, QuizData> entry : _cache) {
if (entry.getKey().endsWith(suffix)) {
keysToRemove.add(entry.getKey());
}
}
if (!keysToRemove.isEmpty()) {
synchronized (this.cache) {
_cache.removeAll(keysToRemove);
}
}
} catch (final Exception e) {
log.error("Failed to clear particular LMS Setup cache: ", e);
this.cache.clear();
}
} else {
this.cache.clear();
}
}
/** Get the for the given quiz id QuizData from cache .

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/LmsAPIServiceImpl.java
View file

@ -94,7 +94,9 @@ public class LmsAPIServiceImpl implements LmsAPIService {
final LmsAPITemplate removedTemplate = this.cache
.remove(new CacheKey(lmsSetup.getModelId(), 0));
removedTemplate.clearCache();
if (removedTemplate != null) {
removedTemplate.clearCache();
}
}
@Override