Commit c04a33a0 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Avoid error because of non-existant descriptor type 

When splitting up the hourly updater into three phases, we lost the
ability to skip downloading descriptors we're not going to process
later.  Hence, we'll get an error because CollecTor doesn't serve
bridge-pool assignments anymore.  But we don't parse them anyway, so
we can as well remove them from our list of descriptors we might care
about.  That avoids this specific error.
parent e430fe2b

src/main/java/org/torproject/onionoo/updater/DescriptorDownloader.java

+0 −3
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ class DescriptorDownloader { 
    case BRIDGE_EXTRA_INFOS:

      this.directory = "bridge-descriptors/extra-infos/";

      break;

    case BRIDGE_POOL_ASSIGNMENTS:

      this.directory = "bridge-pool-assignments/";

      break;

    default:

      log.error("Unknown descriptor type.");

      return;

src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java

+0 −1
Original line number Diff line number Diff line
@@ -8,5 +8,4 @@ enum DescriptorHistory { 
  BRIDGE_STATUS_HISTORY,

  BRIDGE_SERVER_HISTORY,

  BRIDGE_EXTRAINFO_HISTORY,

  BRIDGE_POOLASSIGN_HISTORY,

}
 
 No newline at end of file

src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java

+0 −6
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ class DescriptorQueue { 
    case BRIDGE_EXTRA_INFOS:

      directoryName = "bridge-descriptors/extra-infos";

      break;

    case BRIDGE_POOL_ASSIGNMENTS:

      directoryName = "bridge-pool-assignments";

      break;

    case EXIT_LISTS:

      directoryName = "exit-lists";

      break;
@@ -133,9 +130,6 @@ class DescriptorQueue { 
    case EXIT_LIST_HISTORY:

      historyFileName = "exit-list-history";

      break;

    case BRIDGE_POOLASSIGN_HISTORY:

      historyFileName = "bridge-poolassign-history";

      break;

    case RELAY_CONSENSUS_HISTORY:

      historyFileName = "relay-consensus-history";

      break;

src/main/java/org/torproject/onionoo/updater/DescriptorSource.java

+0 −7
Original line number Diff line number Diff line
@@ -101,10 +101,6 @@ public class DescriptorSource { 
    log.debug("Reading recent " + DescriptorType.BRIDGE_EXTRA_INFOS + " ...");

    this.readDescriptors(DescriptorType.BRIDGE_EXTRA_INFOS,

        DescriptorHistory.BRIDGE_EXTRAINFO_HISTORY, false);

    log.debug("Reading recent " + DescriptorType.BRIDGE_POOL_ASSIGNMENTS

        + " ...");

    this.readDescriptors(DescriptorType.BRIDGE_POOL_ASSIGNMENTS,

        DescriptorHistory.BRIDGE_POOLASSIGN_HISTORY, false);

    log.debug("Reading recent " + DescriptorType.BRIDGE_STATUSES + " ...");

    this.readDescriptors(DescriptorType.BRIDGE_STATUSES,

        DescriptorHistory.BRIDGE_STATUS_HISTORY, false);
@@ -147,9 +143,6 @@ public class DescriptorSource { 
    case BRIDGE_EXTRA_INFOS:

      log.info("Read recent bridge extra-info descriptors");

      break;

    case BRIDGE_POOL_ASSIGNMENTS:

      log.info("Read recent bridge-pool assignments");

      break;

    }

  }

src/main/java/org/torproject/onionoo/updater/DescriptorType.java

+0 −1
Original line number Diff line number Diff line
@@ -10,6 +10,5 @@ public enum DescriptorType { 
  BRIDGE_STATUSES,

  BRIDGE_SERVER_DESCRIPTORS,

  BRIDGE_EXTRA_INFOS,

  BRIDGE_POOL_ASSIGNMENTS,

}