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

Ignore history of parsed bridge descriptor tarballs. 

This is supposed to save some memory, because we're not keeping a
potentially large list of tarball file names in memory.
parent f608c94c

src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java

+6 −6
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class BridgeSnapshotReader { 
    File pbdFile = new File(statsDirectory, "parsed-bridge-directories");

    boolean modified = false;

    if (bdDir.exists()) {

      if (pbdFile.exists()) {

      /*if (pbdFile.exists()) {

        logger.debug("Reading file " + pbdFile.getAbsolutePath() + "...");

        try {

          BufferedReader br = new BufferedReader(new FileReader(pbdFile));
@@ -65,7 +65,7 @@ public class BridgeSnapshotReader { 
              + pbdFile.getAbsolutePath() + "!", e);

          return;

        }

      }

      }*/

      logger.debug("Importing files in directory " + bridgeDirectoriesDir

          + "/...");

      Set<String> descriptorImportHistory = new HashSet<String>();
@@ -84,7 +84,7 @@ public class BridgeSnapshotReader { 
          for (File f : pop.listFiles()) {

            filesInInputDir.add(f);

          }

        } else if (!parsed.contains(pop.getName())) {

        } else { /*if (!parsed.contains(pop.getName())) {*/

          try {

            FileInputStream in = new FileInputStream(pop);

            if (in.available() > 0) {
@@ -219,7 +219,7 @@ public class BridgeSnapshotReader { 
            /* Let's give some memory back, or we'll run out of it. */

            System.gc();



            parsed.add(pop.getName());

            /*parsed.add(pop.getName());*/

            modified = true;

          } catch (IOException e) {

            logger.warn("Could not parse bridge snapshot "
@@ -236,7 +236,7 @@ public class BridgeSnapshotReader { 
          + skippedServerDescriptors + "), and "

          + parsedExtraInfoDescriptors + " extra-info descriptors "

          + "(skipped " + skippedExtraInfoDescriptors + ").");

      if (!parsed.isEmpty() && modified) {

      /*if (!parsed.isEmpty() && modified) {

        logger.debug("Writing file " + pbdFile.getAbsolutePath() + "...");

        try {

          pbdFile.getParentFile().mkdirs();
@@ -251,7 +251,7 @@ public class BridgeSnapshotReader { 
          logger.warn("Failed writing file "

              + pbdFile.getAbsolutePath() + "!", e);

        }

      }

      }*/

    }

  }

}