Added new properties for scheduled module runs and adapted tests accordingly....

Added new properties for scheduled module runs and adapted tests accordingly. Scheduler implementation open. Partially implements task-19018.

Added new properties for scheduled module runs and adapted tests accordingly....
03b832d0 · iwakeh · 2f725efb · 03b832d0 · 03b832d0 · 03b832d0
Commit 03b832d0 authored 8 years ago by iwakeh
--- a/src/main/java/org/torproject/collector/conf/Key.java
+++ b/src/main/java/org/torproject/collector/conf/Key.java
@@ -15,6 +15,21 @@ public enum Key {
  RecentPath(Path.class),
  IndexPath(Path.class),
  StatsPath(Path.class),
+  BridgedescsActivated(Boolean.class),
+  BridgedescsOffsetMinutes(Integer.class),
+  BridgedescsPeriodMinutes(Integer.class),
+  ExitlistsActivated(Boolean.class),
+  ExitlistsOffsetMinutes(Integer.class),
+  ExitlistsPeriodMinutes(Integer.class),
+  RelaydescsActivated(Boolean.class),
+  RelaydescsOffsetMinutes(Integer.class),
+  RelaydescsPeriodMinutes(Integer.class),
+  TorperfActivated(Boolean.class),
+  TorperfOffsetMinutes(Integer.class),
+  TorperfPeriodMinutes(Integer.class),
+  UpdateindexActivated(Boolean.class),
+  UpdateindexOffsetMinutes(Integer.class),
+  UpdateindexPeriodMinutes(Integer.class),
  BridgeSnapshotsDirectory(Path.class),
  CachedRelayDescriptorsDirectories(String[].class),
  CompressRelayDescriptorDownloads(Boolean.class),

--- a/src/main/resources/collector.properties
+++ b/src/main/resources/collector.properties
 ######## Collector Properties
 #
+######## Run Configuration ########
+## the following defines, if this module is activated
+BridgedescsActivated = false
+# period in minutes
+BridgedescsPeriodMinutes = 60
+# offset in minutes since the epoch and
+BridgedescsOffsetMinutes = 9
+## the following defines, if this module is activated
+ExitlistsActivated = false
+# period in minutes
+ExitlistsPeriodMinutes = 60
+# offset in minutes since the epoch and
+ExitlistsOffsetMinutes = 2
+## the following defines, if this module is activated
+RelaydescsActivated = false
+# period in minutes
+RelaydescsPeriodMinutes = 30
+# offset in minutes since the epoch and
+RelaydescsOffsetMinutes = 5
+## the following defines, if this module is activated
+TorperfActivated = false
+# period in minutes
+TorperfPeriodMinutes = 360
+# offset in minutes since the epoch and
+TorperfOffsetMinutes = 1
+# the following defines, if this module is activated
+UpdateindexActivated = false
+# period in minutes
+UpdateindexPeriodMinutes = 2
+# offset in minutes since the epoch and
+UpdateindexOffsetMinutes = 0
 ######## General Properties ########
 InstanceBaseUrl = "https://collector.torproject.org"
 LockFilePath = lock
@@ -7,7 +38,6 @@ IndexPath = out/index
 ArchivePath = out/archive
 RecentPath = out/recent
 StatsPath = out/stats
-
 ######## Relay descriptors ########
 #
 ## Read cached-* files from a local Tor data directory

--- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java
+++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java
@@ -22,7 +22,7 @@ public class ConfigurationTest {
  public void testKeyCount() throws Exception {
    assertEquals("The number of properties keys in enum Key changed."
        + "\n This test class should be adapted.",
-        32, Key.values().length);
+        47, Key.values().length);
  }

  @Test()