From 1eeab55b01862aab4dfba4bb8b7ebd2c0446cb44 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 19 Jan 2018 14:12:50 -0500 Subject: [PATCH] Revert "cache service: don't skip already up to date archives" This reverts commit cb90940b54dc07dd2221d3169e569b08876a3265. --- .../java/net/runelite/cache/client/CacheClient.java | 4 ---- .../net/runelite/cache/client/DownloadWatcher.java | 2 -- .../runelite/http/service/cache/CacheUpdater.java | 12 +----------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/cache-client/src/main/java/net/runelite/cache/client/CacheClient.java b/cache-client/src/main/java/net/runelite/cache/client/CacheClient.java index af93191ad6..8fe0f02f59 100644 --- a/cache-client/src/main/java/net/runelite/cache/client/CacheClient.java +++ b/cache-client/src/main/java/net/runelite/cache/client/CacheClient.java @@ -279,10 +279,6 @@ public class CacheClient implements AutoCloseable { logger.debug("Archive {}/{} in index {} is up to date", ad.getId(), indexData.getArchives().length, index.getId()); - if (watcher != null) - { - watcher.alreadyUpToDate(existing); - } continue; } diff --git a/cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java b/cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java index e96f2df2fe..39812c0796 100644 --- a/cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java +++ b/cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java @@ -31,7 +31,5 @@ public interface DownloadWatcher { void indexComplete(Index index); - void alreadyUpToDate(Archive archive); - void downloadComplete(Archive archive, byte[] data); } diff --git a/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java b/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java index f09e72cf45..4d93cbaa5d 100644 --- a/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java +++ b/http-service/src/main/java/net/runelite/http/service/cache/CacheUpdater.java @@ -65,7 +65,7 @@ public class CacheUpdater private final Sql2o sql2o; private final MinioClient minioClient; - + @Value("${minio.bucket}") private String minioBucket; @@ -116,21 +116,11 @@ public class CacheUpdater indexEntryMap.put(index, entry); } - @Override - public void alreadyUpToDate(Archive archive) - { - updateArchive(archive); - } - @Override public void downloadComplete(Archive archive, byte[] data) { executor.submit(new CacheUploader(minioClient, minioBucket, archive, data)); - updateArchive(archive); - } - private void updateArchive(Archive archive) - { IndexEntry entry = indexEntryMap.get(archive.getIndex()); ArchiveEntry archiveEntry = cacheDao.findArchive(con, entry, archive.getArchiveId(), archive.getNameHash(), archive.getCrc(), archive.getRevision());