[metrics-db/master] Rename rsync/ directory to how it's served: recent/. - tor-commits

18 Oct 2015

commit 9df5d7fca9791b93f330a6e07294fa2ef46688d5
Author: Karsten Loesing karsten.loesing@gmx.net
Date:   Mon Oct 19 00:17:24 2015 +0200
Rename rsync/ directory to how it's served: recent/.
---
 .../ernie/db/bridgedescs/SanitizedBridgesWriter.java     |    8 ++++----
 .../db/bridgepools/BridgePoolAssignmentsProcessor.java   |    4 ++--
 .../ernie/db/exitlists/ExitListDownloader.java           |    4 ++--
 .../torproject/ernie/db/relaydescs/ArchiveWriter.java    |   14 +++++++-------
 .../torproject/ernie/db/torperf/TorperfDownloader.java   |    4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java
index 3bccd6f..af145c7 100644
--- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java
+++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java
@@ -573,7 +573,7 @@ public class SanitizedBridgesWriter extends Thread {
           + "/" + smonth + "/statuses/" + sday + "/" + syear + smonth
           + sday + "-" + stime + "-"
           + "4A0CCD2DDC7995083D73F5D667100C8A5831F16D");
-      File rsyncFile = new File("rsync/bridge-descriptors/statuses/"
+      File rsyncFile = new File("recent/bridge-descriptors/statuses/"
           + tarballFile.getName());
       File[] outputFiles = new File[] { tarballFile, rsyncFile };
       for (File outputFile : outputFiles) {
@@ -913,7 +913,7 @@ public class SanitizedBridgesWriter extends Thread {
         + "/" + descriptorDigest.charAt(0) + "/"
         + descriptorDigest.charAt(1) + "/"
         + descriptorDigest);
-    File rsyncCatFile = new File("rsync/bridge-descriptors/"
+    File rsyncCatFile = new File("recent/bridge-descriptors/"
         + "server-descriptors/" + this.rsyncCatString
         + "-server-descriptors.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
@@ -1186,7 +1186,7 @@ public class SanitizedBridgesWriter extends Thread {
         + descriptorDigest.charAt(0) + "/"
         + descriptorDigest.charAt(1) + "/"
         + descriptorDigest);
-    File rsyncCatFile = new File("rsync/bridge-descriptors/"
+    File rsyncCatFile = new File("recent/bridge-descriptors/"
         + "extra-infos/" + this.rsyncCatString + "-extra-infos.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
     boolean[] append = new boolean[] { false, true };
@@ -1301,7 +1301,7 @@ public class SanitizedBridgesWriter extends Thread {
     long cutOffMillis = System.currentTimeMillis()
         - 3L * 24L * 60L * 60L * 1000L;
     Stack<File> allFiles = new Stack<File>();
-    allFiles.add(new File("rsync/bridge-descriptors"));
+    allFiles.add(new File("recent/bridge-descriptors"));
     while (!allFiles.isEmpty()) {
       File file = allFiles.pop();
       if (file.isDirectory()) {
diff --git a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java
index 942f89f..77217d4 100644
--- a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java
+++ b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -156,7 +156,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
                     sanitizedAssignmentsDirectory, filenameFormat.format(
                     bridgePoolAssignmentTime));
                 File rsyncFile = new File(
-                    "rsync/bridge-pool-assignments/"
+                    "recent/bridge-pool-assignments/"
                     + tarballFile.getName());
                 File[] outputFiles = new File[] { tarballFile,
                     rsyncFile };
@@ -258,7 +258,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
     long cutOffMillis = System.currentTimeMillis()
         - 3L * 24L * 60L * 60L * 1000L;
     Stack<File> allFiles = new Stack<File>();
-    allFiles.add(new File("rsync/bridge-pool-assignments"));
+    allFiles.add(new File("recent/bridge-pool-assignments"));
     while (!allFiles.isEmpty()) {
       File file = allFiles.pop();
       if (file.isDirectory()) {
diff --git a/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java b/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java
index 74ee000..be3070f 100644
--- a/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java
+++ b/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java
@@ -143,7 +143,7 @@ public class ExitListDownloader extends Thread {
   }
/* Write to disk. */
-    File rsyncFile = new File("rsync/exit-lists/"
+    File rsyncFile = new File("recent/exit-lists/"
         + tarballFile.getName());
     File[] outputFiles = new File[] { tarballFile, rsyncFile };
     for (File outputFile : outputFiles) {
@@ -199,7 +199,7 @@ public class ExitListDownloader extends Thread {
     long cutOffMillis = System.currentTimeMillis()
         - 3L * 24L * 60L * 60L * 1000L;
     Stack<File> allFiles = new Stack<File>();
-    allFiles.add(new File("rsync/exit-lists"));
+    allFiles.add(new File("recent/exit-lists"));
     while (!allFiles.isEmpty()) {
       File file = allFiles.pop();
       if (file.isDirectory()) {
diff --git a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java
index 1bee4d4..90b41c3 100644
--- a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java
+++ b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java
@@ -366,7 +366,7 @@ public class ArchiveWriter extends Thread {
     File tarballFile = new File(this.outputDirectory + "/consensus/"
         + printFormat.format(new Date(validAfter)) + "-consensus");
     boolean tarballFileExistedBefore = tarballFile.exists();
-    File rsyncFile = new File("rsync/relay-descriptors/consensuses/"
+    File rsyncFile = new File("recent/relay-descriptors/consensuses/"
         + tarballFile.getName());
     File[] outputFiles = new File[] { tarballFile, rsyncFile };
     if (this.store(CONSENSUS_ANNOTATION, data, outputFiles, null)) {
@@ -395,7 +395,7 @@ public class ArchiveWriter extends Thread {
         + dayDirectoryFileFormat.format(validAfter)
         + "-consensus-microdesc");
     boolean tarballFileExistedBefore = tarballFile.exists();
-    File rsyncFile = new File("rsync/relay-descriptors/microdescs/"
+    File rsyncFile = new File("recent/relay-descriptors/microdescs/"
         + "consensus-microdesc/" + tarballFile.getName());
     File[] outputFiles = new File[] { tarballFile, rsyncFile };
     if (this.store(MICRODESCCONSENSUS_ANNOTATION, data, outputFiles,
@@ -421,7 +421,7 @@ public class ArchiveWriter extends Thread {
         + printFormat.format(new Date(validAfter)) + "-vote-"
         + fingerprint + "-" + digest);
     boolean tarballFileExistedBefore = tarballFile.exists();
-    File rsyncFile = new File("rsync/relay-descriptors/votes/"
+    File rsyncFile = new File("recent/relay-descriptors/votes/"
         + tarballFile.getName());
     File[] outputFiles = new File[] { tarballFile, rsyncFile };
     if (this.store(VOTE_ANNOTATION, data, outputFiles, null)) {
@@ -464,7 +464,7 @@ public class ArchiveWriter extends Thread {
         + digest.substring(0, 1) + "/" + digest.substring(1, 2) + "/"
         + digest);
     boolean tarballFileExistedBefore = tarballFile.exists();
-    File rsyncCatFile = new File("rsync/relay-descriptors/"
+    File rsyncCatFile = new File("recent/relay-descriptors/"
         + "server-descriptors/" + this.rsyncCatString
         + "-server-descriptors.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
@@ -496,7 +496,7 @@ public class ArchiveWriter extends Thread {
         + extraInfoDigest.substring(1, 2) + "/"
         + extraInfoDigest);
     boolean tarballFileExistedBefore = tarballFile.exists();
-    File rsyncCatFile = new File("rsync/relay-descriptors/"
+    File rsyncCatFile = new File("recent/relay-descriptors/"
         + "extra-infos/" + this.rsyncCatString + "-extra-infos.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
     boolean[] append = new boolean[] { false, true };
@@ -532,7 +532,7 @@ public class ArchiveWriter extends Thread {
         + microdescriptorDigest.substring(1, 2) + "/"
         + microdescriptorDigest);
     boolean tarballFileExistedBefore = tarballFile.exists();
-    File rsyncCatFile = new File("rsync/relay-descriptors/"
+    File rsyncCatFile = new File("recent/relay-descriptors/"
         + "microdescs/micro/" + this.rsyncCatString
         + "-micro.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
@@ -804,7 +804,7 @@ public class ArchiveWriter extends Thread {
     long cutOffMillis = System.currentTimeMillis()
         - 3L * 24L * 60L * 60L * 1000L;
     Stack<File> allFiles = new Stack<File>();
-    allFiles.add(new File("rsync/relay-descriptors"));
+    allFiles.add(new File("recent/relay-descriptors"));
     while (!allFiles.isEmpty()) {
       File file = allFiles.pop();
       if (file.isDirectory()) {
diff --git a/src/org/torproject/ernie/db/torperf/TorperfDownloader.java b/src/org/torproject/ernie/db/torperf/TorperfDownloader.java
index a56d9b0..76eb81d 100644
--- a/src/org/torproject/ernie/db/torperf/TorperfDownloader.java
+++ b/src/org/torproject/ernie/db/torperf/TorperfDownloader.java
@@ -597,7 +597,7 @@ public class TorperfDownloader extends Thread {
         + "/" + this.cachedSource + "-"
         + String.valueOf(this.cachedFileSize) + "-"
         + this.cachedStartDate + ".tpf");
-    File rsyncFile = new File("rsync/torperf/" + tarballFile.getName());
+    File rsyncFile = new File("recent/torperf/" + tarballFile.getName());
     File[] outputFiles = new File[] { tarballFile, rsyncFile };
     for (File outputFile : outputFiles) {
       outputFile.getParentFile().mkdirs();
@@ -620,7 +620,7 @@ public class TorperfDownloader extends Thread {
     long cutOffMillis = System.currentTimeMillis()
         - 3L * 24L * 60L * 60L * 1000L;
     Stack<File> allFiles = new Stack<File>();
-    allFiles.add(new File("rsync/torperf"));
+    allFiles.add(new File("recent/torperf"));
     while (!allFiles.isEmpty()) {
       File file = allFiles.pop();
       if (file.isDirectory()) {

    