Commit 8ed8de6e authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Fix bridge pool assignments sync and log statement.

parent d3203ceb

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Minor changes

   - Update create-tarballs.sh to also produce bridge pool assignments

     tarballs.

   - Fix synchronization part of newly re-added bridge pool

     assignments module.





# Changes in version 1.11.0 - 2019-09-19

src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java

+4 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


package org.torproject.metrics.collector.bridgepools;



import org.torproject.descriptor.BridgePoolAssignment;

import org.torproject.metrics.collector.conf.Configuration;

import org.torproject.metrics.collector.conf.ConfigurationException;

import org.torproject.metrics.collector.conf.Key;
@@ -79,6 +80,8 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain { 
   */

  public BridgePoolAssignmentsProcessor(Configuration config) {

    super(config);

    this.mapPathDescriptors.put("recent/bridge-pool-assignments",

        BridgePoolAssignment.class);

  }



  /**
@@ -153,7 +156,7 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain { 
      }

    }

    if (null != latestPublished

        && latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) {

        && latestPublished.plusMinutes(330L).isBefore(LocalDateTime.now())) {

      logger.warn("The last known bridge pool assignment list was "

          + "published at {}, which is more than 5:30 hours in the past.",

          latestPublished);