April 2020 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 82cf95ff3b160b6898a5484a0d0b9772d64b1c2d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 14:51:41 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sv-SE/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv-SE/torbutton.properties b/sv-SE/torbutton.properties index 24a0acd20e..1ef05018f2 100644 --- a/sv-SE/torbutton.properties +++ b/sv-SE/torbutton.properties @@ -76,7 +76,7 @@ onionServices.descNotFound.longDescription=Detaljer: %S — Den begärda beskriv # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Problem med att läsa in onion-webbplats onionServices.descInvalid.header=Onion-webbplats kan inte nås -onionServices.descInvalid=Onion-webbplats är onåbar på grund av ett internt fel. +onionServices.descInvalid=Onion-webbplatsen är onåbar på grund av ett internt fel. onionServices.descInvalid.longDescription=Detaljer: %S — Den begärda beskrivningen för onion-tjänsten kan inte tolkas eller signaturvalidering misslyckades. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Problem med att läsa in onion-webbplatsen @@ -86,7 +86,7 @@ onionServices.introFailed.longDescription=Detaljer: %S — Introduktion misslyck # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problem med att läsa in onion-webbplats onionServices.rendezvousFailed.header=Det går inte att ansluta till onion-webbplats -onionServices.rendezvousFailed=Onion-webbplats är upptagen eller Tor-nätverket är överbelastat. Försök igen senare. +onionServices.rendezvousFailed=Onion-webbplatsen är upptagen eller Tor-nätverket är överbelastat. Försök igen senare. onionServices.rendezvousFailed.longDescription=Detaljer: %S — Klienten misslyckades med att delta i tjänsten, vilket innebär att klienten inte kunde slutföra anslutningen. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Autentisering krävs @@ -95,7 +95,7 @@ onionServices.clientAuthMissing=Tillgång till onion-webbplats kräver en nyckel onionServices.clientAuthMissing.longDescription=Detaljer: %S — Klienten hämtade den begärda beskrivningen för onion-tjänsten men kunde inte dekryptera dess innehåll eftersom information om klientautentisering saknas. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Autentisering misslyckades -onionServices.clientAuthIncorrect.header=Autentisering av onion-webbplats misslyckades +onionServices.clientAuthIncorrect.header=Autentisering av onion-webbplatsen misslyckades onionServices.clientAuthIncorrect=Den medföljande nyckeln är felaktig eller har återkallats. Kontakta administratör för onion-webbplats. onionServices.clientAuthIncorrect.longDescription=Detaljer: %S — Klienten kunde hämta den begärda beskrivningen för onion-tjänsten men kunde inte dekryptera dess innehåll med den tillhandahållna klientauktoriseringsinformationen. Detta kan innebära att åtkomst har återkallats. # Tor SOCKS error 0xF6:

1 0

[translation/torbutton-brandproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandproperties_completed
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit c95038d4e1587e7ca7c9e00232c5c1fd422766a6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 14:51:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandprop… --- sv-SE/brand.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/brand.properties b/sv-SE/brand.properties index 22f1382b26..362ab3abad 100644 --- a/sv-SE/brand.properties +++ b/sv-SE/brand.properties @@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, en snabb webbplats med inbyggd sökfunkti homePageImport=Importera din startsida från %S homePageMigrationPageTitle=Val av startsida -homePageMigrationDescription=Välj den startsida du vill använda: +homePageMigrationDescription=Vänligen välj den startsida du vill använda: syncBrandShortName=Synka

1 0

[translation/torbutton-brandproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandproperties
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 54db6c7f88e8b0cedb46b67b5f7a92f29da8e43c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 14:51:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandprop… --- sv-SE/brand.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/brand.properties b/sv-SE/brand.properties index 22f1382b26..362ab3abad 100644 --- a/sv-SE/brand.properties +++ b/sv-SE/brand.properties @@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, en snabb webbplats med inbyggd sökfunkti homePageImport=Importera din startsida från %S homePageMigrationPageTitle=Val av startsida -homePageMigrationDescription=Välj den startsida du vill använda: +homePageMigrationDescription=Vänligen välj den startsida du vill använda: syncBrandShortName=Synka

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit da11ff534a21ed9ad754fde5c5713c6ab649c8ec Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 14:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sv/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index d6241c2596..0ea43da53a 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-07 10:14-0700\n" -"PO-Revision-Date: 2020-04-08 05:37+0000\n" +"PO-Revision-Date: 2020-04-08 14:45+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -227,7 +227,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB kan tillhandahålla broar med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n" +msgstr "BridgeDB kan tillhandahålla broar med flera %styper av Pluggbara transporter%s,\nsom kan omforma din trafik till Tor Network, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:66 @@ -235,7 +235,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Det finns några broar med IPv6-adresser tillgängliga, men vissa Pluggable\nTransports är inte IPv6-kompatibla.\n" +msgstr "Det finns några broar med IPv6-adresser tillgängliga, men vissa Pluggbara\n transporter är inte IPv6-kompatibla.\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -249,7 +249,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Dessutom har BridgeDB några alldeles vanliga broar %s utan Pluggable\nTransports %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n" +msgstr "Dessutom har BridgeDB några alldeles vanliga broar %s utan Pluggbara\ntransporter %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n" #: bridgedb/strings.py:87 bridgedb/test/test_https.py:356 msgid "What are bridges?"

1 0

[tor/release-0.4.3] Correct 'was not internal' to 'was internal' in test_external_ip()
by dgoulet＠torproject.org 08 Apr '20

08 Apr '20

commit 34faee0600e4efe2a76a1776f6c9bd3173b3e0c5 Author: Mrigyen Sawant <Mrigyen(a)users.noreply.github.com> Date: Tue Apr 7 23:32:39 2020 +0530 Correct 'was not internal' to 'was internal' in test_external_ip() --- src/test/test_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index af3c125a2..42232e467 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -110,7 +110,7 @@ test_addr_basic(void *arg) tt_int_op(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), OP_EQ, 1); \ t1.family = AF_INET6; \ if (tor_addr_is_internal(&t1, for_listening)) \ - TT_DIE(("%s was not internal", a)); \ + TT_DIE(("%s was internal", a)); \ STMT_END #ifndef COCCI

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by dgoulet＠torproject.org 08 Apr '20

08 Apr '20

commit a985f554c491638c56b802d93409e3bb56a24fd3 Merge: e8bbdc69d 34faee060 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 8 09:42:13 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 src/test/test_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by dgoulet＠torproject.org 08 Apr '20

08 Apr '20

commit c1bf819a31d729abee8cf1440cefb7b4776248cc Merge: 0b0b8a5b6 34faee060 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 8 09:42:13 2020 -0400 Merge branch 'maint-0.4.3' src/test/test_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Correct 'was not internal' to 'was internal' in test_external_ip()
by dgoulet＠torproject.org 08 Apr '20

08 Apr '20

commit 34faee0600e4efe2a76a1776f6c9bd3173b3e0c5 Author: Mrigyen Sawant <Mrigyen(a)users.noreply.github.com> Date: Tue Apr 7 23:32:39 2020 +0530 Correct 'was not internal' to 'was internal' in test_external_ip() --- src/test/test_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index af3c125a2..42232e467 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -110,7 +110,7 @@ test_addr_basic(void *arg) tt_int_op(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), OP_EQ, 1); \ t1.family = AF_INET6; \ if (tor_addr_is_internal(&t1, for_listening)) \ - TT_DIE(("%s was not internal", a)); \ + TT_DIE(("%s was internal", a)); \ STMT_END #ifndef COCCI

1 0

[tor/maint-0.4.3] Correct 'was not internal' to 'was internal' in test_external_ip()
by dgoulet＠torproject.org 08 Apr '20

08 Apr '20

commit 34faee0600e4efe2a76a1776f6c9bd3173b3e0c5 Author: Mrigyen Sawant <Mrigyen(a)users.noreply.github.com> Date: Tue Apr 7 23:32:39 2020 +0530 Correct 'was not internal' to 'was internal' in test_external_ip() --- src/test/test_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index af3c125a2..42232e467 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -110,7 +110,7 @@ test_addr_basic(void *arg) tt_int_op(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), OP_EQ, 1); \ t1.family = AF_INET6; \ if (tor_addr_is_internal(&t1, for_listening)) \ - TT_DIE(("%s was not internal", a)); \ + TT_DIE(("%s was internal", a)); \ STMT_END #ifndef COCCI

1 0

[exonerator/master] Simplify logging configuration.
by karsten＠torproject.org 08 Apr '20

08 Apr '20

commit 5a7c19700f740ff88c1a1ae05b2383851d8cf9c7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 8 08:52:45 2020 +0200 Simplify logging configuration. Implements #33549. --- CHANGELOG.md | 1 + build.xml | 2 +- src/build | 2 +- .../exonerator/ExoneraTorDatabaseImporter.java | 2 +- .../metrics/exonerator/ExoneraTorServlet.java | 4 +- .../metrics/exonerator/QueryResponse.java | 3 +- .../metrics/exonerator/QueryServlet.java | 17 +++---- .../torproject/metrics/exonerator/ServerMain.java | 7 +-- src/main/resources/logback.xml | 57 ---------------------- 9 files changed, 20 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca10ec2..d22bc6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Minor changes - Improve logging of the database importer. + - Simplify logging configuration. # Changes in version 4.3.0 - 2020-01-15 diff --git a/build.xml b/build.xml index cdc919c..419e828 100644 --- a/build.xml +++ b/build.xml @@ -108,7 +108,7 @@ </archives> </restrict> <exclude name="**/Test*.class" /> - <zipfileset dir="${resources}" + <zipfileset dir="${buildresources}" prefix="" includes="logback.xml" /> <zipfileset dir="${resources}/web" diff --git a/src/build b/src/build index 264e498..b5e1a2d 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 264e498f54a20f7d299daaf2533d043f880e6a8b +Subproject commit b5e1a2d7b29e58cc0645f068a1ebf4377bf9d8b8 diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index 53e58f7..b4d68e5 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -47,7 +47,7 @@ import java.util.TreeMap; /* Import Tor descriptors into the ExoneraTor database. */ public class ExoneraTorDatabaseImporter { - private static Logger logger + private static final Logger logger = LoggerFactory.getLogger(ExoneraTorDatabaseImporter.class); /** Main function controlling the parsing process. */ diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index b3f5b59..59535ea 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -36,7 +36,8 @@ public class ExoneraTorServlet extends HttpServlet { private static final long serialVersionUID = 1370088989739567509L; - private Logger logger; + private static final Logger logger + = LoggerFactory.getLogger(ExoneraTorServlet.class); private String exoneraTorHost = System.getProperty("exonerator.url", "https://exonerator.torproject.org"); @@ -49,7 +50,6 @@ public class ExoneraTorServlet extends HttpServlet { @Override public void init(ServletConfig config) throws ServletException { super.init(config); - this.logger = LoggerFactory.getLogger(ExoneraTorServlet.class); this.availableLanguageNames = new TreeMap<>(); for (String locale : this.availableLanguages) { ResourceBundle rb = ResourceBundle.getBundle("ExoneraTor", diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index aee8dbf..14f2fa9 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java @@ -18,7 +18,8 @@ import java.util.SortedSet; /** Query response from the ExoneraTor database. */ public class QueryResponse { - private static Logger logger = LoggerFactory.getLogger(QueryResponse.class); + private static final Logger logger + = LoggerFactory.getLogger(QueryResponse.class); /* Actual version implemented by this class. */ private static final String VERSION = "1.0"; diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index ee61e28..dda63da 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -46,7 +46,8 @@ public class QueryServlet extends HttpServlet { private static final long serialVersionUID = 7109011659099295183L; - private Logger logger; + private static final Logger logger + = LoggerFactory.getLogger(QueryServlet.class); private DataSource ds; @@ -56,15 +57,13 @@ public class QueryServlet extends HttpServlet { @Override public void init() { - this.logger = LoggerFactory.getLogger(QueryServlet.class); - /* Look up data source. */ try { Context cxt = new InitialContext(); this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/exonerator"); - this.logger.info("Successfully looked up data source."); + logger.info("Successfully looked up data source."); } catch (NamingException e) { - this.logger.warn("Could not look up data source", e); + logger.warn("Could not look up data source", e); } } @@ -341,17 +340,17 @@ public class QueryServlet extends HttpServlet { } } } catch (SQLException e) { - this.logger.warn("Result set error. Returning 'null'.", e); + logger.warn("Result set error. Returning 'null'.", e); return null; } - this.logger.info("Returned a database connection to the pool after {}.", + logger.info("Returned a database connection to the pool after {}.", Duration.between(requestedConnection, Instant.now())); } catch (SQLException e) { - this.logger.warn("Callable statement error. Returning 'null'.", e); + logger.warn("Callable statement error. Returning 'null'.", e); return null; } } catch (Throwable e) { // Catch all problems left. - this.logger.warn("Database error. Returning 'null'.", e); + logger.warn("Database error. Returning 'null'.", e); return null; } diff --git a/src/main/java/org/torproject/metrics/exonerator/ServerMain.java b/src/main/java/org/torproject/metrics/exonerator/ServerMain.java index 0663e0f..1819a3c 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ServerMain.java +++ b/src/main/java/org/torproject/metrics/exonerator/ServerMain.java @@ -11,20 +11,21 @@ import org.slf4j.LoggerFactory; public class ServerMain { - private static final Logger log = LoggerFactory.getLogger(ServerMain.class); + private static final Logger logger + = LoggerFactory.getLogger(ServerMain.class); /** Starts the web server listening for incoming client connections. */ public static void main(String[] args) { try { Resource jettyXml = Resource.newSystemResource("jetty.xml"); - log.info("Reading configuration from '{}'.", jettyXml); + logger.info("Reading configuration from '{}'.", jettyXml); XmlConfiguration configuration = new XmlConfiguration(jettyXml.getInputStream()); Server server = (Server) configuration.configure(); server.start(); server.join(); } catch (Exception ex) { - log.error("Exiting, because of: {}.", ex.getMessage(), ex); + logger.error("Exiting, because of: {}.", ex.getMessage(), ex); System.exit(1); } } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml deleted file mode 100644 index c29c057..0000000 --- a/src/main/resources/logback.xml +++ /dev/null @@ -1,57 +0,0 @@ -<configuration debug="false"> - -  - <property name="logfile-base" value="${LOGBASE}/exonerator-" /> - -  - <property name="fileall-logname" value="${logfile-base}all" /> - <property name="fileerr-logname" value="${logfile-base}err" /> - <property name="filestatistics-logname" value="${logfile-base}statistics" /> - -  - <property name="utc-date-pattern" value="%date{ISO8601, UTC}" /> - -  - <appender name="FILEALL" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${fileall-logname}.log</file> - <encoder> - <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> - </encoder> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -  - <FileNamePattern>${fileall-logname}.%d{yyyy-MM-dd}.%i.log</FileNamePattern> - <maxHistory>10</maxHistory> - <timeBasedFileNamingAndTriggeringPolicy - class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> -  - <maxFileSize>1MB</maxFileSize> - </timeBasedFileNamingAndTriggeringPolicy> - </rollingPolicy> - </appender> - - <appender name="FILEERR" class="ch.qos.logback.core.FileAppender"> - <file>${fileerr-logname}.log</file> - <encoder> - <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> - </encoder> - -  - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>ERROR</level> - </filter> - </appender> - -  - <logger name="org.torproject" > - <appender-ref ref="FILEERR" /> - </logger> - - <logger name="org.eclipse" level="INFO" /> - <logger name="org.apache" level="INFO" /> - - <root level="INFO"> - <appender-ref ref="FILEALL" /> - </root> - -</configuration> -

1 0