Commit 261f2c06 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Add change log entry and tweaks for shutdown hook.

parent cb78f5fe

CHANGELOG.md

+3 −1
Original line number Diff line number Diff line 
# Changes in version 1.1.0 - 2016-08-31

# Changes in version 1.1.0 - 2016-09-xx



 * Medium changes

   - Add support for Bifroest's bridge descriptor tarballs.

   - Use a shutdown hook that gives currently running modules up to 10

     minutes to finish properly, rather than killing them immediately.



 * Minor changes

   - Remove quotes around base URL in index.json.

src/main/java/org/torproject/collector/cron/Scheduler.java

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public final class Scheduler implements ThreadFactory { 
  private final ThreadFactory threads = Executors.defaultThreadFactory();



  private int currentThreadNo = 0;

  private long gracePeriodMinutes = 20L;

  private long gracePeriodMinutes = 10L;



  private final ScheduledExecutorService scheduler =

      Executors.newScheduledThreadPool(10, this);
@@ -59,7 +59,7 @@ public final class Scheduler implements ThreadFactory { 
      gracePeriodMinutes = conf.getLong(Key.ShutdownGraceWaitMinutes);

    } catch (ConfigurationException ce) {

      logger.warn("Cannot read grace period: {}", ce);

      gracePeriodMinutes = 20L;

      gracePeriodMinutes = 10L;

    }

    List<Callable<Object>> runOnceMains = new ArrayList<>();

    for (Map.Entry<Key, Class<? extends CollecTorMain>> ctmEntry