Take out options for copying to rsync directory.

config.template

@@ -102,16 +102,6 @@
 #DownloadExitList 0
 #
 #
-######## Rsync directory ########
-#
-## Copy recently published decriptors to another directory to provide them
-## via rsync
-#ProvideFilesViaRsync 0
-#
-## Relative path to the directory that shall be provided via rsync
-#RsyncDirectory rsync/
-#
-#
 ######## Torperf downloader ########
 #
 ## Download and merge Torperf .data and .extradata files

src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java

@@ -180,11 +180,9 @@ public class SanitizedBridgesWriter {
     // Finish writing sanitized bridge descriptors to disk
     this.finishWriting();
 
-    // Copy sanitized bridge descriptors from the last 3 days to rsync
+    // Copy sanitized bridge descriptors from the last 3 days to the rsync
     // directory.
-    if (config.getProvideFilesViaRsync()) {
-      RsyncDataProvider rdp = new RsyncDataProvider(
-          new File(config.getRsyncDirectory()));
+    RsyncDataProvider rdp = new RsyncDataProvider();
     rdp.copyFiles(new File(sanitizedBridgesDirectory, "statuses"),
         "bridge-descriptors/statuses");
     rdp.copyFiles(
@@ -193,7 +191,6 @@ public class SanitizedBridgesWriter {
     rdp.copyFiles(new File(sanitizedBridgesDirectory, "extra-info"),
         "bridge-descriptors/extra-infos");
   }
-  }
 
   private String scrubOrAddress(String orAddress, byte[] fingerprintBytes,
       String published) throws IOException {

src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java

@@ -175,12 +175,9 @@ public class BridgePoolAssignmentsProcessor {
 
     // Copy sanitized bridge pool assignments from the last 3 days to the
     // rsync directory.
-    if (config.getProvideFilesViaRsync()) {
-      RsyncDataProvider rdp = new RsyncDataProvider(
-          new File(config.getRsyncDirectory()));
+    RsyncDataProvider rdp = new RsyncDataProvider();
     rdp.copyFiles(sanitizedAssignmentsDirectory,
         "bridge-pool-assignments");
-    }
 
     logger.info("Finished processing bridge pool assignment file(s).");
   }

src/org/torproject/ernie/db/exitlists/ExitListDownloader.java

@@ -100,11 +100,8 @@ public class ExitListDownloader {
     logger.info(dumpStats.toString());
 
     /* Copy exit lists from the last 3 days to the rsync directory. */
-    if (config.getProvideFilesViaRsync()) {
-      RsyncDataProvider rdp = new RsyncDataProvider(
-          new File(config.getRsyncDirectory()));
+    RsyncDataProvider rdp = new RsyncDataProvider();
     rdp.copyFiles(new File("exitlist"), "exit-lists");
   }
 }
-}
 

src/org/torproject/ernie/db/main/Configuration.java

@@ -56,8 +56,6 @@ public class Configuration {
   private String torperfOutputDirectory = "torperf/";
   private SortedMap<String, String> torperfSources = null;
   private List<String> torperfFiles = null;
-  private boolean provideFilesViaRsync = false;
-  private String rsyncDirectory = "rsync";
   public Configuration() {
 
     /* Initialize logger. */
@@ -191,11 +189,6 @@ public class Configuration {
             System.exit(1);
           }
           this.torperfFiles.add(line);
-        } else if (line.startsWith("ProvideFilesViaRsync")) {
-          this.provideFilesViaRsync = Integer.parseInt(
-              line.split(" ")[1]) != 0;
-        } else if (line.startsWith("RsyncDirectory")) {
-          this.rsyncDirectory = line.split(" ")[1];
         } else {
           logger.severe("Configuration file contains unrecognized "
               + "configuration key in line '" + line + "'! Exiting!");
@@ -349,11 +342,5 @@ public class Configuration {
   public List<String> getTorperfFiles() {
     return this.torperfFiles;
   }
-  public boolean getProvideFilesViaRsync() {
-    return this.provideFilesViaRsync;
-  }
-  public String getRsyncDirectory() {
-    return this.rsyncDirectory;
-  }
 }
 

src/org/torproject/ernie/db/main/RsyncDataProvider.java

@@ -25,7 +25,7 @@ public class RsyncDataProvider {
 
   private File rsyncDirectory;
 
-  public RsyncDataProvider(File rsyncDirectory) {
+  public RsyncDataProvider() {
 
     /* Initialize logger. */
     this.logger = Logger.getLogger(RsyncDataProvider.class.getName());
@@ -35,10 +35,10 @@ public class RsyncDataProvider {
         - 3L * 24L * 60L * 60L * 1000L;
 
     /* Create rsync/ directory if it doesn't exist. */
+    this.rsyncDirectory = new File("rsync");
     if (!rsyncDirectory.exists()) {
       rsyncDirectory.mkdirs();
     }
-    this.rsyncDirectory = rsyncDirectory;
   }
 
   public void copyFiles(File fromDirectory, String toRsyncSubDirectory) {

src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java

@@ -88,9 +88,7 @@ public class ArchiveWriter {
 
     /* Copy relay descriptors from the last 3 days to the rsync
      * directory. */
-    if (config.getProvideFilesViaRsync()) {
-      RsyncDataProvider rsdp = new RsyncDataProvider(
-          new File(config.getRsyncDirectory()));
+    RsyncDataProvider rsdp = new RsyncDataProvider();
     rsdp.copyFiles(
         new File(outputDirectory, "consensus"),
         "relay-descriptors/consensuses");
@@ -104,7 +102,6 @@ public class ArchiveWriter {
         new File(outputDirectory, "extra-info"),
         "relay-descriptors/extra-infos");
   }
-  }
 
   private boolean store(byte[] typeAnnotation, byte[] data,
       String filename) {

src/org/torproject/ernie/db/torperf/TorperfDownloader.java

@@ -57,12 +57,9 @@ public class TorperfDownloader {
     this.writeLastMergedTimestamps();
 
     /* Copy Torperf files from the last 3 days to the rsync directory. */
-    if (config.getProvideFilesViaRsync()) {
-      RsyncDataProvider rdp = new RsyncDataProvider(
-          new File(config.getRsyncDirectory()));
+    RsyncDataProvider rdp = new RsyncDataProvider();
     rdp.copyFiles(torperfOutputDirectory, "torperf");
   }
-  }
 
   private File torperfLastMergedFile =
       new File("stats/torperf-last-merged");