December 2017 - tor-commits - lists.torproject.org

[metrics-web/master] Rename 'getColumnHeaders' to reflect that it is no getter.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit 7456617d5b6bbb52ad854deeb06308b5129e9812 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 13:06:52 2017 +0000 Rename 'getColumnHeaders' to reflect that it is no getter. And use some java 8 to shorten the method. --- .../org/torproject/metrics/stats/ipv6servers/Database.java | 2 +- .../torproject/metrics/stats/ipv6servers/OutputLine.java | 13 +++++-------- .../org/torproject/metrics/stats/ipv6servers/Writer.java | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java index 401bdb7..e95aba0 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java @@ -181,7 +181,7 @@ class Database implements AutoCloseable { Statement st = this.connection.createStatement(); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.US); - String queryString = "SELECT " + OutputLine.getColumnHeaders(", ") + String queryString = "SELECT " + OutputLine.columnHeadersDelimitedBy(", ") + " FROM ipv6servers"; try (ResultSet rs = st.executeQuery(queryString)) { while (rs.next()) { diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java index eba5f13..31838d3 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java @@ -4,8 +4,8 @@ package org.torproject.metrics.stats.ipv6servers; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; +import java.util.Arrays; +import java.util.stream.Collectors; /** Data object holding all parts of an output line. */ class OutputLine { @@ -19,12 +19,9 @@ class OutputLine { } /** Column headers joined together with the given delimiter. */ - static String getColumnHeaders(String delimiter) { - List<String> columnHeaders = new ArrayList<>(); - for (Column column : Column.values()) { - columnHeaders.add(column.toString()); - } - return String.join(delimiter, columnHeaders).toLowerCase(); + static String columnHeadersDelimitedBy(String delimiter) { + return Arrays.stream(Column.values()).map(c -> c.toString()) + .collect(Collectors.joining(delimiter)); } /** Date. */ diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java index 13c621f..388fb4d 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java @@ -26,7 +26,7 @@ class Writer { } } List<String> formattedOutputLines = new ArrayList<>(); - formattedOutputLines.add(OutputLine.getColumnHeaders(",")); + formattedOutputLines.add(OutputLine.columnHeadersDelimitedBy(",")); for (OutputLine line : outputLines) { formattedOutputLines.add(line.toString()); }

1 0

[metrics-web/master] Move new module to proper place(s) in the source tree.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit ede6be2e5c29d896ff962608697a39b0780ec32e Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 13:06:47 2017 +0000 Move new module to proper place(s) in the source tree. This includes moving the Java and Sql sources as well as test sources, and adaption of paths in test classes. Created an ant task 'ipv6server' and added its call to run-web-prepare target. --- build.xml | 9 +++++++++ modules/ipv6servers/.gitignore | 3 --- modules/ipv6servers/build.xml | 21 --------------------- shared/bin/20-run-ipv6servers-stats.sh | 5 ----- .../metrics/stats/ipv6servers/Configuration.java | 0 .../metrics/stats/ipv6servers/Database.java | 0 .../torproject/metrics/stats/ipv6servers/Main.java | 0 .../metrics/stats/ipv6servers/OutputLine.java | 0 .../stats/ipv6servers/ParsedNetworkStatus.java | 0 .../stats/ipv6servers/ParsedServerDescriptor.java | 0 .../metrics/stats/ipv6servers/Parser.java | 0 .../metrics/stats/ipv6servers/Writer.java | 0 .../main/sql/ipv6servers}/init-ipv6servers.sql | 0 .../stats/ipv6servers/ParsedNetworkStatusTest.java | 4 ++-- .../ipv6servers/ParsedServerDescriptorTest.java | 12 ++++++------ .../000a7fe20a17bf5d9839a126b1dff43f998aac6f | 0 .../0018ab4f2f28af683d52f06407edbf7ce1bd3b7d | 0 .../0041dbf9fe846f9765882f7dc8332f94b709e35a | 0 .../01003df74972ce952ebfa390f468ef63c50efa25 | 0 .../018c1229d5f56eebfc1d709d4692673d098800e8 | 0 .../ipv6servers}/2017-12-04-20-00-00-consensus.part | 0 ...07-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1.part | 0 .../64dd486d89af14027c9a7b4347a94b74dddb5cdb | 0 .../test/sql/ipv6servers}/test-ipv6servers.sql | 0 24 files changed, 17 insertions(+), 37 deletions(-) diff --git a/build.xml b/build.xml index 6fee387..c884cc6 100644 --- a/build.xml +++ b/build.xml @@ -195,6 +195,7 @@ <antcall target="advbwdist" /> <antcall target="hidserv" /> <antcall target="clients" /> + <antcall target="ipv6servers" /> <antcall target="webstats" /> <antcall target="make-data-available" /> </target> @@ -331,6 +332,14 @@ </antcall> </target> + <target name="ipv6servers" > + <property name="module.name" value="ipv6servers" /> + <antcall target="run-java" > + <param name="module.main" + value="org.torproject.metrics.stats.ipv6servers.Main" /> + </antcall> + </target> + <target name="webstats" > <property name="module.name" value="webstats" /> <property name="rdatadir" value="${modulebase}/${module.name}/RData" /> diff --git a/modules/ipv6servers/.gitignore b/modules/ipv6servers/.gitignore deleted file mode 100644 index c8e90bb..0000000 --- a/modules/ipv6servers/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/stats/ -/status/ - diff --git a/modules/ipv6servers/build.xml b/modules/ipv6servers/build.xml deleted file mode 100644 index 736b579..0000000 --- a/modules/ipv6servers/build.xml +++ /dev/null @@ -1,21 +0,0 @@ -<project default="run" name="ipv6servers" basedir="."> - - <property name="mainclass" - value="org.torproject.metrics.stats.ipv6servers.Main" /> - - <include file="../../shared/build-base.xml" as="basetask"/> - <target name="clean" depends="basetask.clean"/> - <target name="compile" depends="basetask.compile"/> - <target name="test" depends="basetask.test"/> - <target name="run" depends="basetask.run"/> - - <path id="classpath"> - <pathelement path="${classes}"/> - <path refid="base.classpath" /> - <fileset dir="${libs}"> - <include name="postgresql-jdbc3-9.2.jar"/> - </fileset> - </path> - -</project> - diff --git a/shared/bin/20-run-ipv6servers-stats.sh b/shared/bin/20-run-ipv6servers-stats.sh deleted file mode 100755 index 5d7bd13..0000000 --- a/shared/bin/20-run-ipv6servers-stats.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd modules/ipv6servers/ -ant run | grep "\[java\]" -cd ../../ - diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatus.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatus.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatus.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatus.java diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptor.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptor.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptor.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptor.java diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java diff --git a/modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java similarity index 100% rename from modules/ipv6servers/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java diff --git a/modules/ipv6servers/src/main/resources/init-ipv6servers.sql b/src/main/sql/ipv6servers/init-ipv6servers.sql similarity index 100% rename from modules/ipv6servers/src/main/resources/init-ipv6servers.sql rename to src/main/sql/ipv6servers/init-ipv6servers.sql diff --git a/modules/ipv6servers/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java b/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java similarity index 97% rename from modules/ipv6servers/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java rename to src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java index 4b07154..c2642b8 100644 --- a/modules/ipv6servers/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java +++ b/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java @@ -33,8 +33,8 @@ public class ParsedNetworkStatusTest { /** Provide test data. */ @Parameters public static Collection<Object[]> data() { - String relayFileName = "descriptors/2017-12-04-20-00-00-consensus.part"; - String bridgeFileName = "descriptors/" + String relayFileName = "ipv6servers/2017-12-04-20-00-00-consensus.part"; + String bridgeFileName = "ipv6servers/" + "20171204-190507-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1.part"; return Arrays.asList(new Object[][] { { "Relay status without Guard or Exit flag and without IPv6 address. ", diff --git a/modules/ipv6servers/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java b/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java similarity index 88% rename from modules/ipv6servers/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java rename to src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java index 5079031..baff31b 100644 --- a/modules/ipv6servers/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java +++ b/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java @@ -32,22 +32,22 @@ public class ParsedServerDescriptorTest { public static Collection<Object[]> data() { return Arrays.asList(new Object[][] { { "Relay server descriptor without or-address or ipv6-policy line.", - "descriptors/0018ab4f2f28af683d52f06407edbf7ce1bd3b7d", + "ipv6servers/0018ab4f2f28af683d52f06407edbf7ce1bd3b7d", 819200, false, false }, { "Relay server descriptor with or-address and ipv6-policy line.", - "descriptors/01003df74972ce952ebfa390f468ef63c50efa25", + "ipv6servers/01003df74972ce952ebfa390f468ef63c50efa25", 6576128, true, true }, { "Relay server descriptor with or-address line only.", - "descriptors/018c1229d5f56eebfc1d709d4692673d098800e8", + "ipv6servers/018c1229d5f56eebfc1d709d4692673d098800e8", 0, true, false }, { "Bridge server descriptor without or-address or ipv6-policy line.", - "descriptors/000a7fe20a17bf5d9839a126b1dff43f998aac6f", + "ipv6servers/000a7fe20a17bf5d9839a126b1dff43f998aac6f", 0, false, false }, { "Bridge server descriptor with or-address line.", - "descriptors/0041dbf9fe846f9765882f7dc8332f94b709e35a", + "ipv6servers/0041dbf9fe846f9765882f7dc8332f94b709e35a", 0, true, false }, { "Bridge server descriptor with (ignored) ipv6-policy accept line.", - "descriptors/64dd486d89af14027c9a7b4347a94b74dddb5cdb", + "ipv6servers/64dd486d89af14027c9a7b4347a94b74dddb5cdb", 0, false, false } }); } diff --git a/modules/ipv6servers/src/test/resources/descriptors/000a7fe20a17bf5d9839a126b1dff43f998aac6f b/src/test/resources/ipv6servers/000a7fe20a17bf5d9839a126b1dff43f998aac6f similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/000a7fe20a17bf5d9839a126b1dff43f998aac6f rename to src/test/resources/ipv6servers/000a7fe20a17bf5d9839a126b1dff43f998aac6f diff --git a/modules/ipv6servers/src/test/resources/descriptors/0018ab4f2f28af683d52f06407edbf7ce1bd3b7d b/src/test/resources/ipv6servers/0018ab4f2f28af683d52f06407edbf7ce1bd3b7d similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/0018ab4f2f28af683d52f06407edbf7ce1bd3b7d rename to src/test/resources/ipv6servers/0018ab4f2f28af683d52f06407edbf7ce1bd3b7d diff --git a/modules/ipv6servers/src/test/resources/descriptors/0041dbf9fe846f9765882f7dc8332f94b709e35a b/src/test/resources/ipv6servers/0041dbf9fe846f9765882f7dc8332f94b709e35a similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/0041dbf9fe846f9765882f7dc8332f94b709e35a rename to src/test/resources/ipv6servers/0041dbf9fe846f9765882f7dc8332f94b709e35a diff --git a/modules/ipv6servers/src/test/resources/descriptors/01003df74972ce952ebfa390f468ef63c50efa25 b/src/test/resources/ipv6servers/01003df74972ce952ebfa390f468ef63c50efa25 similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/01003df74972ce952ebfa390f468ef63c50efa25 rename to src/test/resources/ipv6servers/01003df74972ce952ebfa390f468ef63c50efa25 diff --git a/modules/ipv6servers/src/test/resources/descriptors/018c1229d5f56eebfc1d709d4692673d098800e8 b/src/test/resources/ipv6servers/018c1229d5f56eebfc1d709d4692673d098800e8 similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/018c1229d5f56eebfc1d709d4692673d098800e8 rename to src/test/resources/ipv6servers/018c1229d5f56eebfc1d709d4692673d098800e8 diff --git a/modules/ipv6servers/src/test/resources/descriptors/2017-12-04-20-00-00-consensus.part b/src/test/resources/ipv6servers/2017-12-04-20-00-00-consensus.part similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/2017-12-04-20-00-00-consensus.part rename to src/test/resources/ipv6servers/2017-12-04-20-00-00-consensus.part diff --git a/modules/ipv6servers/src/test/resources/descriptors/20171204-190507-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1.part b/src/test/resources/ipv6servers/20171204-190507-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1.part similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/20171204-190507-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1.part rename to src/test/resources/ipv6servers/20171204-190507-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1.part diff --git a/modules/ipv6servers/src/test/resources/descriptors/64dd486d89af14027c9a7b4347a94b74dddb5cdb b/src/test/resources/ipv6servers/64dd486d89af14027c9a7b4347a94b74dddb5cdb similarity index 100% rename from modules/ipv6servers/src/test/resources/descriptors/64dd486d89af14027c9a7b4347a94b74dddb5cdb rename to src/test/resources/ipv6servers/64dd486d89af14027c9a7b4347a94b74dddb5cdb diff --git a/modules/ipv6servers/src/test/sql/test-ipv6servers.sql b/src/test/sql/ipv6servers/test-ipv6servers.sql similarity index 100% rename from modules/ipv6servers/src/test/sql/test-ipv6servers.sql rename to src/test/sql/ipv6servers/test-ipv6servers.sql

1 0

[metrics-web/master] Make Database AutoCloseable and use try-with-resource.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit bad6542772eacfd57b7030df417f845f2aa74583 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 13:06:49 2017 +0000 Make Database AutoCloseable and use try-with-resource. --- .../metrics/stats/ipv6servers/Database.java | 6 +- .../torproject/metrics/stats/ipv6servers/Main.java | 109 ++++++++++----------- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java index c334263..401bdb7 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java @@ -20,7 +20,7 @@ import java.util.TimeZone; /** Database wrapper to connect to the database, insert data, run the stored * procedure for aggregating data, and query aggregated data as output. */ -class Database { +class Database implements AutoCloseable { /** Database connection string. */ private String jdbcString; @@ -210,8 +210,8 @@ class Database { return statistics; } - /** Disconnect from the database. */ - void disconnect() throws SQLException { + /** Release database connection. */ + public void close() throws SQLException { this.connection.close(); } } diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java index 81433c0..508d73e 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java @@ -35,72 +35,65 @@ public class Main { File historyFile = new File(Configuration.history); reader.setHistoryFile(historyFile); Parser parser = new Parser(); - Database database = new Database(Configuration.database); - try { - for (Descriptor descriptor : reader.readDescriptors( - new File(Configuration.descriptors - + "recent/relay-descriptors/consensuses"), - new File(Configuration.descriptors - + "recent/relay-descriptors/server-descriptors"), - new File(Configuration.descriptors - + "recent/bridge-descriptors/statuses"), - new File(Configuration.descriptors - + "recent/bridge-descriptors/server-descriptors"), - new File(Configuration.descriptors - + "archive/relay-descriptors/consensuses"), - new File(Configuration.descriptors - + "archive/relay-descriptors/server-descriptors"), - new File(Configuration.descriptors - + "archive/bridge-descriptors/statuses"), - new File(Configuration.descriptors - + "archive/bridge-descriptors/server-descriptors"))) { - if (descriptor instanceof ServerDescriptor) { - database.insertServerDescriptor(parser.parseServerDescriptor( - (ServerDescriptor) descriptor)); - } else if (descriptor instanceof RelayNetworkStatusConsensus) { - database.insertStatus(parser.parseRelayNetworkStatusConsensus( - (RelayNetworkStatusConsensus) descriptor)); - } else if (descriptor instanceof BridgeNetworkStatus) { - database.insertStatus(parser.parseBridgeNetworkStatus( - (BridgeNetworkStatus) descriptor)); - } else { - log.debug("Skipping unknown descriptor of type {}.", - descriptor.getClass()); + try (Database database = new Database(Configuration.database)) { + try { + for (Descriptor descriptor : reader.readDescriptors( + new File(Configuration.descriptors + + "recent/relay-descriptors/consensuses"), + new File(Configuration.descriptors + + "recent/relay-descriptors/server-descriptors"), + new File(Configuration.descriptors + + "recent/bridge-descriptors/statuses"), + new File(Configuration.descriptors + + "recent/bridge-descriptors/server-descriptors"), + new File(Configuration.descriptors + + "archive/relay-descriptors/consensuses"), + new File(Configuration.descriptors + + "archive/relay-descriptors/server-descriptors"), + new File(Configuration.descriptors + + "archive/bridge-descriptors/statuses"), + new File(Configuration.descriptors + + "archive/bridge-descriptors/server-descriptors"))) { + if (descriptor instanceof ServerDescriptor) { + database.insertServerDescriptor(parser.parseServerDescriptor( + (ServerDescriptor) descriptor)); + } else if (descriptor instanceof RelayNetworkStatusConsensus) { + database.insertStatus(parser.parseRelayNetworkStatusConsensus( + (RelayNetworkStatusConsensus) descriptor)); + } else if (descriptor instanceof BridgeNetworkStatus) { + database.insertStatus(parser.parseBridgeNetworkStatus( + (BridgeNetworkStatus) descriptor)); + } else { + log.debug("Skipping unknown descriptor of type {}.", + descriptor.getClass()); + } } - } - log.info("Aggregating database entries."); - database.aggregate(); + log.info("Aggregating database entries."); + database.aggregate(); - log.info("Committing all updated parts in the database."); - database.commit(); - } catch (SQLException sqle) { - log.error("Cannot recover from SQL exception while inserting or " - + "aggregating data. Rolling back and exiting.", sqle); - database.rollback(); - database.disconnect(); - return; - } - reader.saveHistoryFile(historyFile); + log.info("Committing all updated parts in the database."); + database.commit(); + } catch (SQLException sqle) { + log.error("Cannot recover from SQL exception while inserting or " + + "aggregating data. Rolling back and exiting.", sqle); + database.rollback(); + return; + } + reader.saveHistoryFile(historyFile); - log.info("Querying aggregated statistics from the database."); - Iterable<OutputLine> output; - try { - output = database.queryServersIpv6(); + log.info("Querying aggregated statistics from the database."); + Iterable<OutputLine> output = database.queryServersIpv6(); + log.info("Writing aggregated statistics to {}.", Configuration.output); + if (null != output) { + new Writer().write(Paths.get(Configuration.output), output); + } + + log.info("Terminating ipv6servers module."); } catch (SQLException sqle) { log.error("Cannot recover from SQL exception while querying. Not writing " + "output file.", sqle); - return; - } finally { - database.disconnect(); - } - - log.info("Writing aggregated statistics to {}.", Configuration.output); - if (null != output) { - new Writer().write(Paths.get(Configuration.output), output); } - - log.info("Terminating ipv6servers module."); } }

1 0

[metrics-web/master] Make column headers lower-case.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit 661c53df912606b885ea3d74622addf9567b61b4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 22 18:45:35 2017 +0100 Make column headers lower-case. --- src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java index 31838d3..a6a1aa5 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java @@ -20,7 +20,7 @@ class OutputLine { /** Column headers joined together with the given delimiter. */ static String columnHeadersDelimitedBy(String delimiter) { - return Arrays.stream(Column.values()).map(c -> c.toString()) + return Arrays.stream(Column.values()).map(c -> c.toString().toLowerCase()) .collect(Collectors.joining(delimiter)); }

1 0

[metrics-web/master] Add a specification for stats/servers-ipv6.csv.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit 10dc76c611835a7d42eb6105c0698039317b29a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 7 09:21:40 2017 +0100 Add a specification for stats/servers-ipv6.csv. Implements #24218. --- .../metrics/web/research/ResearchStatsServlet.java | 1 + src/main/resources/web/jsps/stats.jsp | 68 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java b/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java index 4d657c9..ab4b954 100644 --- a/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java +++ b/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java @@ -31,6 +31,7 @@ public class ResearchStatsServlet extends HttpServlet { this.statsDir = new File(config.getInitParameter("statsDir")); this.availableStatisticsFiles = new TreeSet<>(); this.availableStatisticsFiles.add("servers"); + this.availableStatisticsFiles.add("ipv6servers"); this.availableStatisticsFiles.add("bandwidth"); this.availableStatisticsFiles.add("clients"); this.availableStatisticsFiles.add("userstats-combined"); diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 629130d..233b3d5 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -140,6 +140,74 @@ relays when serving directory data.</li> </div> <div class="container"> +<h2>Relays and bridges supporting IPv6 <a href="#ipv6servers" name="ipv6servers" class="anchor">#</a></h2> + +The following data file contains statistics on <a href="glossary.html#relay">relays</a> and <a href="glossary.html#bridge">bridges</a> supporting IPv6. +A relay can support IPv6 by announcing an IPv6 address and port for the OR protocol, which may then be confirmed as reachable by the <a href="glossary.html#directory-authority">directory authorities</a>. +It can further permit exiting to IPv6 targets. +A bridge can support IPv6 by announcing an IPv6 address and port for the OR protocol. +The <a href="glossary.html#bridge-authority">bridge authority</a> may test +reachability of IPv6 OR addresses similar to directory authorities, however it +does not explicitly list reachable IPv6 OR addresses of bridges. +Some of the statistics are available for subsets of relays that got the "Guard" and/or "Exit" <a href="glossary.html#relay-flag">relay flags</a>. +The data file contains daily (mean) averages of relay or server numbers and advertised bandwidth numbers. + +Download as <a href="stats/ipv6servers.csv">CSV file</a>. + +The statistics file contains the following columns: +<ul> + +<li>valid_after_date: UTC date (YYYY-MM-DD) when relays or bridges have +been listed as running.</li> + +<li>server: Server type, which can be either "relay" or +"bridge".</li> + +<li>guard_relay: Whether relays included in this line have the +"Guard" relay flag ("t") or not ("f"). +If this column contains the empty string, all running relays are included, +regardless of assigned relay flags. +Always the empty string for bridges.</li> + +<li>exit_relay: Whether relays included in this line have the +"Exit" relay flag ("t") or not ("f"). +If this column contains the empty string, all running relays are included, +regardless of assigned relay flags. +Always the empty string for bridges.</li> + +<li>announced_ipv6: Whether relays or bridges have announced an IPv6 +address in their server descriptor ("t") or not ("f"). +If this column contains the empty string, all running relays or bridges are +included, regardless of whether they have announced an IPv6 address.</li> + +<li>exiting_ipv6_relay: Whether relays have announced an IPv6 exit policy +other than "reject 1-65535" in their server descriptor ("t") or +not ("f"). +If this column contains the empty string, all running relays are included, +regardless of IPv6 exit policy. +Always the empty string for bridges.</li> + +<li>reachable_ipv6_relay: Whether enough directory authorities have +confirmed reachability of an IPv6 OR address announced by a relay, by including +an "a" line in the consensus ("t") or not ("f"). +If this column contains the empty string, all running relays are included, +regardless of whether their IPv6 address was found reachable. +Always the empty string for bridges.</li> + +<li>server_count_sum_avg: Number of relays or bridges matching the +criteria in the previous columns, computed as the mean value over all statuses +published on the given date.</li> + +<li>advertised_bandwidth_bytes_sum_avg: Total advertised bandwidth of all +relays matching the previous criteria, computed as the mean value over all +statuses published on the given date. +Always the empty string for bridges.</li> + +</ul> + +</div> + +<div class="container"> <h2>Advertised bandwidth distribution and n-th fastest relays <a href="#advbwdist" name="advbwdist" class="anchor">#</a></h2> The following data file contains statistics on the distribution of <a

1 0

[metrics-web/master] Avoid trouble with path separators and repetitive code.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit e01f041554c68197b7429e123c3149dcf1f4029c Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 13:06:51 2017 +0000 Avoid trouble with path separators and repetitive code. --- .../torproject/metrics/stats/ipv6servers/Main.java | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java index 508d73e..28c1d24 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java @@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.nio.file.Paths; import java.sql.SQLException; +import java.util.Arrays; /** Main class of the ipv6servers module that imports relevant parts from server * descriptors and network statuses into a database, and exports aggregate @@ -24,6 +25,16 @@ public class Main { private static Logger log = LoggerFactory.getLogger(Main.class); + private static String[][] paths = { + {"recent", "relay-descriptors", "consensuses"}, + {"recent", "relay-descriptors", "server-descriptors"}, + {"recent", "bridge-descriptors", "statuses"}, + {"recent", "bridge-descriptors", "server-descriptors"}, + {"archive", "relay-descriptors", "consensuses"}, + {"archive", "relay-descriptors", "server-descriptors"}, + {"archive", "bridge-descriptors", "statuses"}, + {"archive", "bridge-descriptors", "server-descriptors"}}; + /** Run the module. */ public static void main(String[] args) throws Exception { @@ -38,22 +49,9 @@ public class Main { try (Database database = new Database(Configuration.database)) { try { for (Descriptor descriptor : reader.readDescriptors( - new File(Configuration.descriptors - + "recent/relay-descriptors/consensuses"), - new File(Configuration.descriptors - + "recent/relay-descriptors/server-descriptors"), - new File(Configuration.descriptors - + "recent/bridge-descriptors/statuses"), - new File(Configuration.descriptors - + "recent/bridge-descriptors/server-descriptors"), - new File(Configuration.descriptors - + "archive/relay-descriptors/consensuses"), - new File(Configuration.descriptors - + "archive/relay-descriptors/server-descriptors"), - new File(Configuration.descriptors - + "archive/bridge-descriptors/statuses"), - new File(Configuration.descriptors - + "archive/bridge-descriptors/server-descriptors"))) { + Arrays.stream(paths).map((String[] path) + -> Paths.get(Configuration.descriptors, path).toFile()) + .toArray(File[]::new))) { if (descriptor instanceof ServerDescriptor) { database.insertServerDescriptor(parser.parseServerDescriptor( (ServerDescriptor) descriptor));

1 0

[metrics-web/master] Removed redundant comments and added explanatory comment.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit 66caac798cb4524956c1bc9114ab7b1441b1e89e Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 13:06:54 2017 +0000 Removed redundant comments and added explanatory comment. --- .../java/org/torproject/metrics/stats/ipv6servers/Parser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java index a66ad23..962ca27 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java @@ -25,6 +25,9 @@ class Parser { Ipv6ServerDescriptor parsedDescriptor = new Ipv6ServerDescriptor(); parsedDescriptor.digest = serverDescriptor.getDigestSha1Hex(); for (String orAddress : serverDescriptor.getOrAddresses()) { + /* Check whether the additional OR address is an IPv6 address containing + * at least two colons as opposed to an IPv4 address and TCP port + * containing only one colon as separator. */ if (StringUtils.countMatches(orAddress, ":") >= 2) { parsedDescriptor.announced = true; break; @@ -47,14 +50,12 @@ class Parser { return parsedDescriptor; } - /** Parse a relay network status. */ Ipv6NetworkStatus parseRelayNetworkStatusConsensus( RelayNetworkStatusConsensus consensus) throws Exception { return this.parseStatus(true, consensus.getValidAfterMillis(), consensus.getStatusEntries().values()); } - /** Parse a bridge network status. */ Ipv6NetworkStatus parseBridgeNetworkStatus(BridgeNetworkStatus status) throws Exception { return this.parseStatus(false, status.getPublishedMillis(), @@ -85,6 +86,9 @@ class Parser { && !entry.getFlags().contains("BadExit"); parsedEntry.reachable = false; for (String orAddress : entry.getOrAddresses()) { + /* Check whether the additional OR address is an IPv6 address + * containing at least two colons as opposed to an IPv4 address and + * TCP port containing only one colon as separator. */ if (StringUtils.countMatches(orAddress, ":") >= 2) { parsedEntry.reachable = true; break;

1 0

[metrics-web/master] Rename Parsed* to Ipv6*.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit c39409096ee1531b0c0b0a8fc79ae295d84e6e27 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 13:06:53 2017 +0000 Rename Parsed* to Ipv6*. Indicate that this is not the typical descriptor, but only provides relevant information for the ipv6servers module. --- .../metrics/stats/ipv6servers/Database.java | 29 ++++++++++------------ ...edNetworkStatus.java => Ipv6NetworkStatus.java} | 2 +- ...erDescriptor.java => Ipv6ServerDescriptor.java} | 2 +- .../metrics/stats/ipv6servers/Parser.java | 14 +++++------ ...kStatusTest.java => Ipv6NetworkStatusTest.java} | 6 ++--- ...ptorTest.java => Ipv6ServerDescriptorTest.java} | 4 +-- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java index e95aba0..1d5187b 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java @@ -84,10 +84,10 @@ class Database implements AutoCloseable { /** Insert a server descriptor into the server_descriptors table. */ void insertServerDescriptor( - ParsedServerDescriptor parsedServerDescriptor) throws SQLException { + Ipv6ServerDescriptor serverDescriptor) throws SQLException { this.psServerDescriptorsSelect.clearParameters(); this.psServerDescriptorsSelect.setString(1, - parsedServerDescriptor.digest); + serverDescriptor.digest); try (ResultSet rs = psServerDescriptorsSelect.executeQuery()) { if (rs.next()) { if (rs.getBoolean(1)) { @@ -97,28 +97,25 @@ class Database implements AutoCloseable { } } this.psServerDescriptorsInsert.clearParameters(); - this.psServerDescriptorsInsert.setString(1, - parsedServerDescriptor.digest); + this.psServerDescriptorsInsert.setString(1, serverDescriptor.digest); this.psServerDescriptorsInsert.setInt(2, - parsedServerDescriptor.advertisedBandwidth); - this.psServerDescriptorsInsert.setBoolean(3, - parsedServerDescriptor.announced); - this.psServerDescriptorsInsert.setBoolean(4, - parsedServerDescriptor.exiting); + serverDescriptor.advertisedBandwidth); + this.psServerDescriptorsInsert.setBoolean(3, serverDescriptor.announced); + this.psServerDescriptorsInsert.setBoolean(4, serverDescriptor.exiting); this.psServerDescriptorsInsert.execute(); } /** Insert a status and all contained entries into the statuses and * status_entries table. */ - void insertStatus(ParsedNetworkStatus parsedNetworkStatus) + void insertStatus(Ipv6NetworkStatus networkStatus) throws SQLException { this.psStatusesSelect.clearParameters(); this.psStatusesSelect.setString(1, - parsedNetworkStatus.isRelay ? "relay" : "bridge"); + networkStatus.isRelay ? "relay" : "bridge"); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.US); this.psStatusesSelect.setTimestamp(2, - Timestamp.from(ZonedDateTime.of(parsedNetworkStatus.timestamp, + Timestamp.from(ZonedDateTime.of(networkStatus.timestamp, ZoneId.of("UTC")).toInstant()), calendar); try (ResultSet rs = this.psStatusesSelect.executeQuery()) { if (rs.next()) { @@ -131,11 +128,11 @@ class Database implements AutoCloseable { int statusId = -1; this.psStatusesInsert.clearParameters(); this.psStatusesInsert.setString(1, - parsedNetworkStatus.isRelay ? "relay" : "bridge"); + networkStatus.isRelay ? "relay" : "bridge"); this.psStatusesInsert.setTimestamp(2, - Timestamp.from(ZonedDateTime.of(parsedNetworkStatus.timestamp, + Timestamp.from(ZonedDateTime.of(networkStatus.timestamp, ZoneId.of("UTC")).toInstant()), calendar); - this.psStatusesInsert.setInt(3, parsedNetworkStatus.running); + this.psStatusesInsert.setInt(3, networkStatus.running); this.psStatusesInsert.execute(); try (ResultSet rs = this.psStatusesInsert.getGeneratedKeys()) { if (rs.next()) { @@ -146,7 +143,7 @@ class Database implements AutoCloseable { throw new SQLException("Could not retrieve auto-generated key for new " + "statuses entry."); } - for (ParsedNetworkStatus.Entry entry : parsedNetworkStatus.entries) { + for (Ipv6NetworkStatus.Entry entry : networkStatus.entries) { this.psStatusEntriesInsert.clearParameters(); this.psStatusEntriesInsert.setInt(1, statusId); this.psStatusEntriesInsert.setString(2, entry.digest); diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatus.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java similarity index 97% rename from src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatus.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java index f185250..1600d47 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatus.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java @@ -9,7 +9,7 @@ import java.util.List; /** Data object holding all relevant parts parsed from a (relay or bridge) * network status. */ -class ParsedNetworkStatus { +class Ipv6NetworkStatus { /** Whether this is a relay network status as opposed to a bridge network * status. */ diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptor.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java similarity index 96% rename from src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptor.java rename to src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java index c8d0ceb..3655d3e 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptor.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java @@ -5,7 +5,7 @@ package org.torproject.metrics.stats.ipv6servers; /** Data object holding all relevant parts parsed from a (relay or bridge) * server descriptor. */ -class ParsedServerDescriptor { +class Ipv6ServerDescriptor { /** Hex-encoded SHA-1 server descriptor digest. */ String digest; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java index 95b1d5a..a66ad23 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java @@ -20,9 +20,9 @@ import java.time.ZoneId; class Parser { /** Parse a (relay or bridge) server descriptor. */ - ParsedServerDescriptor parseServerDescriptor( + Ipv6ServerDescriptor parseServerDescriptor( ServerDescriptor serverDescriptor) { - ParsedServerDescriptor parsedDescriptor = new ParsedServerDescriptor(); + Ipv6ServerDescriptor parsedDescriptor = new Ipv6ServerDescriptor(); parsedDescriptor.digest = serverDescriptor.getDigestSha1Hex(); for (String orAddress : serverDescriptor.getOrAddresses()) { if (StringUtils.countMatches(orAddress, ":") >= 2) { @@ -48,22 +48,22 @@ class Parser { } /** Parse a relay network status. */ - ParsedNetworkStatus parseRelayNetworkStatusConsensus( + Ipv6NetworkStatus parseRelayNetworkStatusConsensus( RelayNetworkStatusConsensus consensus) throws Exception { return this.parseStatus(true, consensus.getValidAfterMillis(), consensus.getStatusEntries().values()); } /** Parse a bridge network status. */ - ParsedNetworkStatus parseBridgeNetworkStatus(BridgeNetworkStatus status) + Ipv6NetworkStatus parseBridgeNetworkStatus(BridgeNetworkStatus status) throws Exception { return this.parseStatus(false, status.getPublishedMillis(), status.getStatusEntries().values()); } - private ParsedNetworkStatus parseStatus(boolean isRelay, long timestampMillis, + private Ipv6NetworkStatus parseStatus(boolean isRelay, long timestampMillis, Iterable<NetworkStatusEntry> entries) { - ParsedNetworkStatus parsedStatus = new ParsedNetworkStatus(); + Ipv6NetworkStatus parsedStatus = new Ipv6NetworkStatus(); parsedStatus.isRelay = isRelay; parsedStatus.timestamp = Instant.ofEpochMilli(timestampMillis) .atZone(ZoneId.of("UTC")).toLocalDateTime(); @@ -77,7 +77,7 @@ class Parser { if (!entry.getFlags().contains("Running")) { continue; } - ParsedNetworkStatus.Entry parsedEntry = new ParsedNetworkStatus.Entry(); + Ipv6NetworkStatus.Entry parsedEntry = new Ipv6NetworkStatus.Entry(); parsedEntry.digest = entry.getDescriptor().toLowerCase(); if (isRelay) { parsedEntry.guard = entry.getFlags().contains("Guard"); diff --git a/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java similarity index 97% rename from src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java rename to src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java index c2642b8..9069218 100644 --- a/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedNetworkStatusTest.java +++ b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.Collection; @RunWith(Parameterized.class) -public class ParsedNetworkStatusTest { +public class Ipv6NetworkStatusTest { /** Provide test data. */ @Parameters @@ -102,7 +102,7 @@ public class ParsedNetworkStatusTest { for (Descriptor descriptor : DescriptorSourceFactory.createDescriptorParser().parseDescriptors( sb.toString().getBytes(), new File(this.fileName), this.fileName)) { - ParsedNetworkStatus parsedNetworkStatus; + Ipv6NetworkStatus parsedNetworkStatus; if (descriptor instanceof RelayNetworkStatusConsensus) { parsedNetworkStatus = new Parser().parseRelayNetworkStatusConsensus( (RelayNetworkStatusConsensus) descriptor); @@ -119,7 +119,7 @@ public class ParsedNetworkStatusTest { assertEquals(this.description, this.running, parsedNetworkStatus.running); if (null != this.digest) { boolean foundEntry = false; - for (ParsedNetworkStatus.Entry parsedEntry + for (Ipv6NetworkStatus.Entry parsedEntry : parsedNetworkStatus.entries) { if (this.digest.equals(parsedEntry.digest)) { assertEquals(this.description, this.guard, parsedEntry.guard); diff --git a/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java similarity index 97% rename from src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java rename to src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java index baff31b..1842315 100644 --- a/src/test/java/org/torproject/metrics/stats/ipv6servers/ParsedServerDescriptorTest.java +++ b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.Collection; @RunWith(Parameterized.class) -public class ParsedServerDescriptorTest { +public class Ipv6ServerDescriptorTest { /** Provide test data. */ @Parameters @@ -83,7 +83,7 @@ public class ParsedServerDescriptorTest { : DescriptorSourceFactory.createDescriptorParser().parseDescriptors( sb.toString().getBytes(), new File(this.fileName), this.fileName)) { assertTrue(this.description, descriptor instanceof ServerDescriptor); - ParsedServerDescriptor parsedServerDescriptor + Ipv6ServerDescriptor parsedServerDescriptor = new Parser().parseServerDescriptor((ServerDescriptor) descriptor); assertEquals(this.description, this.advertisedBandwidth, parsedServerDescriptor.advertisedBandwidth);

1 0

[metrics-web/master] Remove variable that is only used once.
by karsten＠torproject.org 22 Dec '17

22 Dec '17

commit 6aa81e5202c7328b164747f5a581147833205357 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 13:06:50 2017 +0000 Remove variable that is only used once. --- src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java index 96f8a8d..13c621f 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java @@ -20,8 +20,7 @@ class Writer { throws IOException { File parentFile = filePath.toFile().getParentFile(); if (null != parentFile && !parentFile.exists()) { - boolean madeDirs = parentFile.mkdirs(); - if (!madeDirs) { + if (!parentFile.mkdirs()) { throw new IOException("Unable to create parent directory of output " + "file. Not writing this file."); }

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 22 Dec '17

22 Dec '17

commit 2f93714aedad23532d7284c7ccdca76c26a22053 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 22 12:21:15 2017 +0000 Update translations for tor-browser-manual --- en_GB/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 08926855c..e6cba9b08 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -505,7 +505,7 @@ msgstr "" #: index.page:6 msgid "Tor Browser User Manual" -msgstr "" +msgstr "Tor Browser User Manual" #: known-issues.page:6 msgid "A list of known issues."

1 0