[tor-commits] [metrics-db/master] Rename directories to match what's served in recent/.

[karsten@xxxxxxxxxxxxxx]

commit 812b87e4c257dc2233c1d80bd231b34ff3e0afab
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Sun Oct 18 22:49:44 2015 +0200

    Rename directories to match what's served in recent/.
---
 .../torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java  |    4 ++--
 src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java        |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java
index 7311e9a..3bccd6f 100644
--- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java
+++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java
@@ -914,7 +914,7 @@ public class SanitizedBridgesWriter extends Thread {
         + descriptorDigest.charAt(1) + "/"
         + descriptorDigest);
     File rsyncCatFile = new File("rsync/bridge-descriptors/"
-        + "server-descriptors-cat/" + this.rsyncCatString
+        + "server-descriptors/" + this.rsyncCatString
         + "-server-descriptors.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
     boolean[] append = new boolean[] { false, true };
@@ -1187,7 +1187,7 @@ public class SanitizedBridgesWriter extends Thread {
         + descriptorDigest.charAt(1) + "/"
         + descriptorDigest);
     File rsyncCatFile = new File("rsync/bridge-descriptors/"
-        + "extra-infos-cat/" + this.rsyncCatString + "-extra-infos.tmp");
+        + "extra-infos/" + this.rsyncCatString + "-extra-infos.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
     boolean[] append = new boolean[] { false, true };
     try {
diff --git a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java
index 1304cd5..1bee4d4 100644
--- a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java
+++ b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java
@@ -465,7 +465,7 @@ public class ArchiveWriter extends Thread {
         + digest);
     boolean tarballFileExistedBefore = tarballFile.exists();
     File rsyncCatFile = new File("rsync/relay-descriptors/"
-        + "server-descriptors-cat/" + this.rsyncCatString
+        + "server-descriptors/" + this.rsyncCatString
         + "-server-descriptors.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
     boolean[] append = new boolean[] { false, true };
@@ -497,7 +497,7 @@ public class ArchiveWriter extends Thread {
         + extraInfoDigest);
     boolean tarballFileExistedBefore = tarballFile.exists();
     File rsyncCatFile = new File("rsync/relay-descriptors/"
-        + "extra-infos-cat/" + this.rsyncCatString + "-extra-infos.tmp");
+        + "extra-infos/" + this.rsyncCatString + "-extra-infos.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
     boolean[] append = new boolean[] { false, true };
     if (this.store(EXTRA_INFO_ANNOTATION, data, outputFiles, append)) {
@@ -533,7 +533,7 @@ public class ArchiveWriter extends Thread {
         + microdescriptorDigest);
     boolean tarballFileExistedBefore = tarballFile.exists();
     File rsyncCatFile = new File("rsync/relay-descriptors/"
-        + "microdescs/micro-cat/" + this.rsyncCatString
+        + "microdescs/micro/" + this.rsyncCatString
         + "-micro.tmp");
     File[] outputFiles = new File[] { tarballFile, rsyncCatFile };
     boolean[] append = new boolean[] { false, true };

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits