update cs refresh behavior

Author: Ian-Nara

src/main/java/com/uid2/optout/Main.java

@@ -246,8 +246,18 @@ public void run(String[] args) throws IOException {
 
         List<Future> futs = new ArrayList<>();
 
-        // create optout cloud sync verticle (reads from optout_s3_folder)
-        OptOutCloudSync cs = new OptOutCloudSync(this.config, true);
+        // create optout cloud sync verticle
+        // if optout_legacy_producer_s3_folder is set, use it for the old producer's CloudSync
+        // this allows redirecting old producer output to a different folder during migration
+        String legacyFolder = this.config.getString(Const.Config.OptOutLegacyProducerS3FolderProp);
+        String mainFolder = this.config.getString(Const.Config.OptOutS3FolderProp);
+        JsonObject cloudSyncConfig = this.config;
+        if (legacyFolder != null && !legacyFolder.equals(mainFolder)) {
+            cloudSyncConfig = new JsonObject().mergeIn(this.config)
+                .put(Const.Config.OptOutS3FolderProp, legacyFolder);
+            LOGGER.info("old producer configured to use folder: {} (main folder: {})", legacyFolder, mainFolder);
+        }
+        OptOutCloudSync cs = new OptOutCloudSync(cloudSyncConfig, true);
         CloudSyncVerticle cloudSyncVerticle = new CloudSyncVerticle("optout", this.fsOptOut, this.fsLocal, cs, this.config);
 
         // deploy optout cloud sync verticle
@@ -268,21 +278,8 @@ public void run(String[] args) throws IOException {
             OptOutLogProducer logProducer = new OptOutLogProducer(this.config, eventUpload, eventUpload);
             futs.add(this.deploySingleInstance(logProducer));
 
-            // create cloud sync for legacy producer uploads
-            // if optout_legacy_producer_s3_folder is set, old producer writes to that folder instead of optout_s3_folder
-            String legacyFolder = this.config.getString(Const.Config.OptOutLegacyProducerS3FolderProp);
-            OptOutCloudSync legacyProducerCs;
-            if (legacyFolder != null) {
-                JsonObject legacyConfig = new JsonObject().mergeIn(this.config)
-                    .put(Const.Config.OptOutS3FolderProp, legacyFolder);
-                legacyProducerCs = new OptOutCloudSync(legacyConfig, true);
-                LOGGER.info("legacy producer will write to separate folder: {}", legacyFolder);
-            } else {
-                legacyProducerCs = cs;
-            }
-
             // upload last delta produced and potentially not uploaded yet
-            futs.add((this.uploadLastDelta(legacyProducerCs, logProducer, cloudSyncVerticle.eventUpload(), cloudSyncVerticle.eventRefresh())));
+            futs.add((this.uploadLastDelta(cs, logProducer, cloudSyncVerticle.eventUpload(), cloudSyncVerticle.eventRefresh())));
         }
 
         // deploy sqs producer if enabled