Implemented logic to update cloud asn cache

Author: hafizmaaz

src/main/groovy/io/ipgeolocation/databaseReader/databases/cloudprovider/CloudProviderIndexer.groovy

@@ -8,10 +8,12 @@ import static com.google.common.base.Preconditions.checkNotNull
 class CloudProviderIndexer {
     private Set<String> cloudProviders
     private Set<String> cloudAsnSet
-
+    private Set<String> backupCloudAsnSet
+    public static volatile boolean updatingMainCache = false
     CloudProviderIndexer() {
         cloudProviders = new HashSet<String>()
         cloudAsnSet = new HashSet<String>()
+        backupCloudAsnSet = new HashSet<String>()
     }
 
     void index(String cloudProvider) {
@@ -44,13 +46,21 @@ class CloudProviderIndexer {
     boolean isCloudAsn(String asn) {
         checkNotNull(asn, "Pre-condition violated: asn must not be null.")
         asn = normalizeAsn(asn)
-        cloudAsnSet.contains(asn)
+        if (updatingMainCache) {
+            return backupCloudAsnSet.contains(asn)
+        } else {
+            return cloudAsnSet.contains(asn)
+        }
     }
 
     private static String normalizeAsn(String asn) {
         asn.toLowerCase().replaceAll("as|[\\s.,\\-_\\\"]", "")
     }
 
+    void copyMainToBackupCache() {
+        backupCloudAsnSet.addAll(cloudAsnSet)
+    }
+
     Integer size() {
         cloudProviders.size()
     }
@@ -62,4 +72,8 @@ class CloudProviderIndexer {
     void clearCloudASNSet () {
         cloudAsnSet.clear()
     }
+
+    void clearBackupCloudASNSet () {
+        backupCloudAsnSet.clear()
+    }
 }

src/main/groovy/io/ipgeolocation/databaseReader/services/database/CsvDatabaseService.groovy

@@ -85,9 +85,14 @@ class CsvDatabaseService implements DatabaseService {
 
     @Scheduled(cron = "0 0 0 ? * WED", zone = "UTC")
     void updateCloudAsnCache() {
-        if (databaseUpdateService.getDatabaseVersion() in DatabaseVersion.DATABASES_WITH_PROXY) {
+        if (databaseUpdateService.getDatabaseVersion() in DatabaseVersion.DATABASES_WITH_PROXY
+                && databaseUpdateService.databaseType == "csv") {
+            cloudProviderIndexer.copyMainToBackupCache()
+            CloudProviderIndexer.updatingMainCache = true
             cloudProviderIndexer.clearCloudASNSet()
             cloudProviderLoader.downloadAndCacheBadASN(cloudProviderIndexer, cloudAsnUrl)
+            CloudProviderIndexer.updatingMainCache = false
+            cloudProviderIndexer.clearBackupCloudASNSet()
         }
     }
 

src/main/groovy/io/ipgeolocation/databaseReader/services/database/MMDBDatabaseService.groovy

@@ -82,11 +82,16 @@ class MMDBDatabaseService implements DatabaseService {
         }
     }
 
-    @Scheduled(cron = "0 0 0 ? * WED")
+    @Scheduled(cron = "0 0 0 ? * WED", zone = "UTC")
     void updateCloudAsnCache() {
-        if (databaseUpdateService.getDatabaseVersion() in DatabaseVersion.DATABASES_WITH_PROXY) {
+        if (databaseUpdateService.getDatabaseVersion() in DatabaseVersion.DATABASES_WITH_PROXY
+                && databaseUpdateService.databaseType == "mmdb") {
+            cloudProviderIndexer.copyMainToBackupCache()
+            CloudProviderIndexer.updatingMainCache = true
             cloudProviderIndexer.clearCloudASNSet()
             cloudProviderLoader.downloadAndCacheBadASN(cloudProviderIndexer, cloudAsnUrl)
+            CloudProviderIndexer.updatingMainCache = false
+            cloudProviderIndexer.clearBackupCloudASNSet()
         }
     }