commit 40a8efabebfc6c6357d8a566bae43ed3ac3b7301 Author: Karsten Loesing karsten.loesing@gmx.net Date: Sat Nov 3 11:20:44 2012 -0400

Move default output directories to out/. --- config.template | 10 +++++----- .../ernie/db/exitlists/ExitListDownloader.java | 2 +- .../torproject/ernie/db/main/Configuration.java | 13 ++++++++----- 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/config.template b/config.template index 29da891..ecb2e3b 100644 --- a/config.template +++ b/config.template @@ -59,7 +59,7 @@ #WriteDirectoryArchives 0 # ## Relative path to directory to write directory archives to -#DirectoryArchivesOutputDirectory directory-archive/ +#DirectoryArchivesOutputDirectory out/relay-descriptors/ # # ######## Bridge descriptors ######## @@ -83,7 +83,7 @@ #LimitBridgeDescriptorMappings -1 # ## Relative path to directory to write sanitized bridges to -#SanitizedBridgesWriteDirectory sanitized-bridges/ +#SanitizedBridgesWriteDirectory out/bridge-descriptors/ # # ######## Bridge pool assignments ######## @@ -93,11 +93,11 @@ #ProcessBridgePoolAssignments 0 # ## Relative path to directory to read bridge pool assignment files from -#AssignmentsDirectory in/bridge-assignments/ +#AssignmentsDirectory in/bridge-pool-assignments/ # ## Relative path to directory to write sanitized bridge pool assignment ## files to -#SanitizedAssignmentsDirectory sanitized-assignments/ +#SanitizedAssignmentsDirectory out/bridge-pool-assignments/ # # ######## Exit lists ######## @@ -112,7 +112,7 @@ #ProcessTorperfFiles 0 # ## Relative path to the directory to store Torperf files in -#TorperfOutputDirectory torperf/ +#TorperfOutputDirectory out/torperf/ # ## Torperf source names and base URLs (option can be contained multiple ## times) diff --git a/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java b/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java index 9b1f40b..fef3777 100644 --- a/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java +++ b/src/org/torproject/ernie/db/exitlists/ExitListDownloader.java @@ -89,7 +89,7 @@ public class ExitListDownloader extends Thread { SimpleDateFormat tarballFormat = new SimpleDateFormat("yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); tarballFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - File tarballFile = new File("exitlist/" + tarballFormat.format( + File tarballFile = new File("out/exit-lists/" + tarballFormat.format( downloadedDate));

long maxScanMillis = 0L; diff --git a/src/org/torproject/ernie/db/main/Configuration.java b/src/org/torproject/ernie/db/main/Configuration.java index 0f30d73..9f6fdf7 100644 --- a/src/org/torproject/ernie/db/main/Configuration.java +++ b/src/org/torproject/ernie/db/main/Configuration.java @@ -23,7 +23,8 @@ import java.util.logging.Logger; */ public class Configuration { private boolean writeDirectoryArchives = false; - private String directoryArchivesOutputDirectory = "directory-archive/"; + private String directoryArchivesOutputDirectory = + "out/relay-descriptors/"; private boolean importCachedRelayDescriptors = false; private List<String> cachedRelayDescriptorsDirectory = new ArrayList<String>(Arrays.asList( @@ -35,7 +36,8 @@ public class Configuration { private boolean writeSanitizedBridges = false; private boolean replaceIPAddressesWithHashes = false; private long limitBridgeDescriptorMappings = -1L; - private String sanitizedBridgesWriteDirectory = "sanitized-bridges/"; + private String sanitizedBridgesWriteDirectory = + "out/bridge-descriptors/"; private boolean importBridgeSnapshots = false; private String bridgeSnapshotsDirectory = "in/bridge-descriptors/"; private boolean downloadRelayDescriptors = false; @@ -62,10 +64,11 @@ public class Configuration { private boolean compressRelayDescriptorDownloads; private boolean downloadExitList = false; private boolean processBridgePoolAssignments = false; - private String assignmentsDirectory = "in/bridge-assignments/"; - private String sanitizedAssignmentsDirectory = "sanitized-assignments/"; + private String assignmentsDirectory = "in/bridge-pool-assignments/"; + private String sanitizedAssignmentsDirectory = + "out/bridge-pool-assignments/"; private boolean processTorperfFiles = false; - private String torperfOutputDirectory = "torperf/"; + private String torperfOutputDirectory = "out/torperf/"; private SortedMap<String, String> torperfSources = null; private List<String> torperfFiles = null; public Configuration() {