[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] [ernie/master 2/2] Be more precise when checking configuration.
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Tue, 13 Apr 2010 16:38:43 +0200
Subject: Be more precise when checking configuration.
Commit: b820c4e7d8355fd0f0ebe08e1c1f284821781bf5
---
src/Configuration.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/Configuration.java b/src/Configuration.java
index 7950eed..9bb8bb6 100644
--- a/src/Configuration.java
+++ b/src/Configuration.java
@@ -246,13 +246,20 @@ public class Configuration {
if (!(this.importCachedRelayDescriptors ||
this.importDirectoryArchives || this.downloadRelayDescriptors) &&
(this.writeDirectoryArchives ||
- this.writeRelayDescriptorDatabase || this.writeConsensusStats ||
- this.writeDirreqStats || this.writeBridgeStats ||
+ this.writeRelayDescriptorDatabase || this.writeDirreqStats ||
this.writeServerDescriptorStats)) {
logger.warning("We are configured to write relay descriptor to at "
+ "least one data sink, but we don't have a single data source "
+ "containing relay descriptors.");
}
+ if (!(this.importCachedRelayDescriptors ||
+ this.importDirectoryArchives || this.downloadRelayDescriptors ||
+ this.importSanitizedBridges || this.importBridgeSnapshots) &&
+ (this.writeBridgeStats || this.writeConsensusStats)) {
+ logger.warning("We are configured to write relay or bridge "
+ + "descriptors to at least one data sink, but we have neither "
+ + "data sources containing relay nor bridge descriptors.");
+ }
if ((this.importSanitizedBridges || this.importBridgeSnapshots) &&
!(this.writeSanitizedBridges || this.writeConsensusStats ||
this.writeBridgeStats)) {
@@ -261,8 +268,7 @@ public class Configuration {
+ "bridge descriptors to.");
}
if (!(this.importSanitizedBridges || this.importBridgeSnapshots) &&
- (this.writeSanitizedBridges || this.writeConsensusStats ||
- this.writeBridgeStats)) {
+ (this.writeSanitizedBridges)) {
logger.warning("We are configured to write bridge descriptor to at "
+ "least one data sink, but we don't have a single data source "
+ "containing bridge descriptors.");
--
1.6.5