commit 753f63bc3c08c46094a861f1bede5d1fd61f2bd2
Author: iwakeh <[email protected]>
Date: Sun Feb 15 18:00:00 2015 +0000
task-14826: depending on the starting time the updater will run every hour
at minute 15,16,17,18,or 19. The Lock file ist only used for the single run.
---
.../java/org/torproject/onionoo/cron/Main.java | 140 +++++++++++++-------
1 file changed, 90 insertions(+), 50 deletions(-)
diff --git a/src/main/java/org/torproject/onionoo/cron/Main.java
b/src/main/java/org/torproject/onionoo/cron/Main.java
index 986f22d..c098dfe 100644
--- a/src/main/java/org/torproject/onionoo/cron/Main.java
+++ b/src/main/java/org/torproject/onionoo/cron/Main.java
@@ -2,6 +2,11 @@
* See LICENSE for licensing information */
package org.torproject.onionoo.cron;
+import java.util.Calendar;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.torproject.onionoo.docs.DocumentStore;
@@ -20,61 +25,96 @@ public class Main {
private Main() {
}
+ private static final ScheduledExecutorService scheduler =
+ Executors.newScheduledThreadPool(1);
+
public static void main(String[] args) {
- log.debug("Started ...");
- LockFile lf = new LockFile();
- log.info("Initializing.");
- if (lf.acquireLock()) {
- log.info("Acquired lock");
- } else {
- log.error("Could not acquire lock. Is Onionoo "
- + "already running? Terminating");
+ boolean runOnce = "true".equals(System.getProperty(
+ "onionoo.cron.runonce", "true"));
+ if (runOnce){
+ log.info("Going to run one-time updater ... ");
+ LockFile lf = new LockFile();
+ log.info("Initializing.");
+ if (lf.acquireLock()) {
+ log.info("Acquired lock");
+ } else {
+ log.error("Could not acquire lock. Is Onionoo already running? "
+ + "Terminating");
+ return;
+ }
+ new Updater().run();
+ log.info("Releasing lock.");
+ if (lf.releaseLock()) {
+ log.info("Released lock");
+ } else {
+ log.error("Could not release lock. The next execution may not "
+ + "start as expected");
+ }
return;
- }
- log.debug(" ... running .... ");
-
- DescriptorSource dso = DescriptorSourceFactory.getDescriptorSource();
- log.info("Initialized descriptor source");
- DocumentStore ds = DocumentStoreFactory.getDocumentStore();
- log.info("Initialized document store");
- StatusUpdateRunner sur = new StatusUpdateRunner();
- log.info("Initialized status update runner");
- DocumentWriterRunner dwr = new DocumentWriterRunner();
- log.info("Initialized document writer runner");
-
- log.info("Downloading descriptors.");
- dso.downloadDescriptors();
-
- log.info("Reading descriptors.");
- dso.readDescriptors();
-
- log.info("Updating internal status files.");
- sur.updateStatuses();
-
- log.info("Updating document files.");
- dwr.writeDocuments();
-
- log.info("Shutting down.");
- dso.writeHistoryFiles();
- log.info("Wrote parse histories");
- ds.flushDocumentCache();
- log.info("Flushed document cache");
-
- log.info("Gathering statistics.");
- sur.logStatistics();
- dwr.logStatistics();
- log.info("Descriptor source\n" + dso.getStatsString());
- log.info("Document store\n" + ds.getStatsString());
-
- log.info("Releasing lock.");
- if (lf.releaseLock()) {
- log.info("Released lock");
} else {
- log.error("Could not release lock. The next "
- + "execution may not start as expected");
+ log.info("Periodic updater started.");
+ final Runnable updater = new Updater();
+ int currentMinute = Calendar.getInstance().get(Calendar.MINUTE);
+ int initialDelay = (75 - currentMinute + currentMinute % 5) % 60;
+
+ /* Run after initialDelay delay and then every hour. */
+ log.info("Periodic updater will start every hour at minute "
+ + ((currentMinute + initialDelay) % 60) + ".");
+ scheduler.scheduleAtFixedRate(updater, initialDelay, 60,
+ TimeUnit.MINUTES);
}
+ }
+
+ private static class Updater implements Runnable{
+
+ private Logger log = LoggerFactory.getLogger(Main.class);
+
+ public void run() {
+ log.debug("Started update ...");
- log.info("Terminating.");
+ DescriptorSource dso =
+ DescriptorSourceFactory.getDescriptorSource();
+ log.info("Initialized descriptor source");
+ DocumentStore ds = DocumentStoreFactory.getDocumentStore();
+ log.info("Initialized document store");
+ StatusUpdateRunner sur = new StatusUpdateRunner();
+ log.info("Initialized status update runner");
+ DocumentWriterRunner dwr = new DocumentWriterRunner();
+ log.info("Initialized document writer runner");
+
+ log.info("Downloading descriptors.");
+ dso.downloadDescriptors();
+
+ log.info("Reading descriptors.");
+ dso.readDescriptors();
+
+ log.info("Updating internal status files.");
+ sur.updateStatuses();
+
+ log.info("Updating document files.");
+ dwr.writeDocuments();
+
+ log.info("Shutting down.");
+ dso.writeHistoryFiles();
+ log.info("Wrote parse histories");
+ ds.flushDocumentCache();
+ log.info("Flushed document cache");
+
+ log.info("Gathering statistics.");
+ sur.logStatistics();
+ dwr.logStatistics();
+ log.info("Descriptor source\n" + dso.getStatsString());
+ log.info("Document store\n" + ds.getStatsString());
+
+ /* Clean up to prevent out-of-memory exception, and to ensure that
+ * the next execution starts with a fresh descriptor source. */
+ log.info("Cleaning up.");
+ ds.invalidateDocumentCache();
+ DocumentStoreFactory.setDocumentStore(null);
+ DescriptorSourceFactory.setDescriptorSource(null);
+
+ log.info("Done.");
+ }
}
}
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
