tor-commits January 2016

tor-commits@lists.torproject.org

19 participants
1449 discussions

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit a56c73ad6079b17a7a1feb3f2cc52f4ef1abea54 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 15:46:02 2016 +0000 Update translations for tails-perl5lib --- cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs.po b/cs.po index fb778ee..bb7c1aa 100644 --- a/cs.po +++ b/cs.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-18 14:33+0000\n" +"PO-Revision-Date: 2016-01-18 15:40+0000\n" "Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit 09532ce5ab21edf47799291f714cdad789f26678 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 15:45:45 2016 +0000 Update translations for tails-misc --- cs.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cs.po b/cs.po index 66dc7b4..02f0fbd 100644 --- a/cs.po +++ b/cs.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-18 15:40+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit cd55bb40c9c5095bfba0a9b4b075341c9e3d3bd2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 15:45:22 2016 +0000 Update translations for tails-persistence-setup --- cs/cs.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index a0d67a0..f493462 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-18 15:40+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -128,71 +128,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Symbolický odkaz do $ HOME nalezne každý soubor nebo adresář v `dotfiles\" adresáři" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Nastavení trvalého oddílu pro Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Chyba" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Zařízení %s už má trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Zařízení %s nemá dostatek nealokovaného místa." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Zařízení %s nemá trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nelze smazat trvalý oddíl, zatímco je používán. Musíte restartovat Tails bez používání trvalého oddílu." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Trvalý oddíl není odemčen." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Trvalý oddíl není připojen." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Trvalý oddíl není čitelný. Problém s povolením nebo s vlastnictvím?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Trvalý oddíl nejde přepsat. Nebyl připojen pouze pro čtení?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails běží ze zařízení %s, které není USB / SDIO." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Zařízení %s je optické." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Zařízení %s nebylo pomocí Tails instaleru vytvořeno." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Průvodce tvorby trvalého oddílu dokončil svou činnost." -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -244,32 +244,33 @@ msgstr "Heslo nesmí být prázdné" msgid "Passphrases do not match" msgstr "Hesla se neshodují" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Selhani" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Připojování trvalého oddílu Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Trvalý oddíl Tails bude připojen." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Opravuji oprávnění na stálém svazku." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Oprávnění na stálém svazku budou opravena." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Vytváření..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Vytváření trvalého oddílu." @@ -319,10 +320,10 @@ msgstr "Trvalý oddíl %s (%s), na %s %s zařízení bude smazán." msgid "Delete" msgstr "Smazat" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Mazání..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Mazání trvalého oddílu..."

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit 7bf05768dd77ee56084553c2d79fae60c310af40 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 14:45:53 2016 +0000 Update translations for tails-perl5lib --- cs.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cs.po b/cs.po index 745227f..fb778ee 100644 --- a/cs.po +++ b/cs.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jiří Vírava <appukonrad(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-18 14:33+0000\n" +"Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Chyba" #: ../lib/Tails/RunningSystem.pm:161 msgid ""

1 0

[tor-browser-bundle/hardened-builds] Bug 18072: Change recommended PT type to obfs4.
by gk＠torproject.org 18 Jan '16

18 Jan '16

commit 87ed0048caa1b5ff260ff061ee7351d20de593d0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 16 12:17:19 2016 +0000 Bug 18072: Change recommended PT type to obfs4. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 11c7471..f4a8448 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -1,5 +1,5 @@ # Tor Launcher preferences (default bridges): -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239");

1 0

[tor-browser-bundle/master] Bug 18072: Change recommended PT type to obfs4.
by gk＠torproject.org 18 Jan '16

18 Jan '16

commit 27fe16afe9f45c1052b7b975eae47f0ec723425a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 16 12:17:19 2016 +0000 Bug 18072: Change recommended PT type to obfs4. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 11c7471..f4a8448 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -1,5 +1,5 @@ # Tor Launcher preferences (default bridges): -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239");

1 0

[snowflake/master] Use chan struct{} instead of chan bool in openChan.
by dcf＠torproject.org 18 Jan '16

18 Jan '16

commit a77ae6b771e5550b3a5370f7b1f2c0e434f4e9eb Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 03:04:39 2016 -0800 Use chan struct{} instead of chan bool in openChan. http://dave.cheney.net/2014/03/25/the-empty-struct "...there is one important practical use of empty structs, and that is the chan struct{} construct used for signaling between go routines" --- client/snowflake.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index ae87f89..da609b3 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -104,7 +104,7 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( offerChan := make(chan *webrtc.SessionDescription) errChan := make(chan error) - openChan := make(chan bool) + openChan := make(chan struct{}) pc, err := webrtc.NewPeerConnection(config) if err != nil { @@ -151,7 +151,7 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( } dc.OnOpen = func() { log.Println("OnOpen channel") - openChan <- true + openChan <- struct{}{} } dc.OnClose = func() { log.Println("OnClose channel")

1 0

[onionoo/master] Take out old news.
by karsten＠torproject.org 18 Jan '16

18 Jan '16

commit 736efae1f1639b705644d04757a7fafbfd2ad7c6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 18 09:53:01 2016 +0100 Take out old news. --- web/protocol.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/web/protocol.html b/web/protocol.html index 98c3343..c6cc534 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -1198,7 +1198,7 @@ found. </li> <li> -effective_family +effective_family <code class="typeof">array of strings</code> optional @@ -1208,12 +1208,11 @@ These relays are part of this relay's family and they consider this relay to be part of their family. Omitted if empty or if descriptor containing this information cannot be found. -Added on July 3, 2015. </li> <li> -alleged_family +alleged_family <code class="typeof">array of strings</code> optional @@ -1223,12 +1222,11 @@ These relays are part of this relay's family but they don't consider this relay to be part of their family. Omitted if empty or if descriptor containing this information cannot be found. -Added on August 25, 2015. </li> <li> -indirect_family +indirect_family <code class="typeof">array of strings</code> optional @@ -1237,7 +1235,6 @@ mutual family relationship with this relay but that can be reached by following effective, mutual family relationships starting at this relay. Omitted if empty or if descriptor containing this information cannot be found. -Added on August 25, 2015. </li> @@ -1308,7 +1305,6 @@ Boolean field saying whether the consensus weight of this relay is based on a threshold of 3 or more measurements by Tor bandwidth authorities. Omitted if the network status consensus containing this relay does not contain measurement information. -Added on August 13, 2015. </li>

1 0

[onionoo/master] Remove deprecated "family" field from details documents.
by karsten＠torproject.org 18 Jan '16

18 Jan '16

commit ac26b0e18fbd7cf22cb830da0a6b0c707b110d82 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jan 9 17:08:31 2016 +0100 Remove deprecated "family" field from details documents. On August 25, 2015, we added the optional "alleged_family" and "effective_family" fields and deprecated the likewise optional "family" field in details documents. As of yesterday, Atlas (#16961), Globe (#16962), and Compass (#17720) stopped using the "family" field and switched over to the new fields. It's time to finally remove the "family" field from details documents. Implements #18026. --- build.xml | 2 +- src/main/java/org/torproject/onionoo/docs/DetailsDocument.java | 8 -------- src/main/java/org/torproject/onionoo/docs/DetailsStatus.java | 8 -------- .../java/org/torproject/onionoo/server/ResponseBuilder.java | 4 +--- .../torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 1 - .../org/torproject/onionoo/writer/DetailsDocumentWriter.java | 1 - web/protocol.html | 7 +++++-- 7 files changed, 7 insertions(+), 24 deletions(-) diff --git a/build.xml b/build.xml index de5d84a..8de738a 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ <project default="dist" name="onionoo" basedir="."> - <property name="onionoo.protocol.version" value="3.0"/> + <property name="onionoo.protocol.version" value="3.1"/> <property name="release.version" value="${onionoo.protocol.version}.0"/> <property name="javasources" value="src/main/java"/> diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index 69d8efe..38bbc3b 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -281,14 +281,6 @@ public class DetailsDocument extends Document { return unescapeJSON(this.platform); } - private List<String> family; - public void setFamily(List<String> family) { - this.family = family; - } - public List<String> getFamily() { - return this.family; - } - private SortedSet<String> alleged_family; public void setAllegedFamily(SortedSet<String> allegedFamily) { this.alleged_family = allegedFamily; diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 62e621b..460fb97 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -102,14 +102,6 @@ public class DetailsStatus extends Document { return unescapeJSON(this.platform); } - private List<String> family; - public void setFamily(List<String> family) { - this.family = family; - } - public List<String> getFamily() { - return this.family; - } - private SortedSet<String> alleged_family; public void setAllegedFamily(SortedSet<String> allegedFamily) { this.alleged_family = allegedFamily; diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 4afa782..76790d5 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -70,7 +70,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "3.0"; + private static final String PROTOCOL_VERSION = "3.1"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; @@ -248,8 +248,6 @@ public class ResponseBuilder { dd.setContact(detailsDocument.getContact()); } else if (field.equals("platform")) { dd.setPlatform(detailsDocument.getPlatform()); - } else if (field.equals("family")) { - dd.setFamily(detailsDocument.getFamily()); } else if (field.equals("consensus_weight_fraction")) { dd.setConsensusWeightFraction( detailsDocument.getConsensusWeightFraction()); diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index d28e249..b9552bf 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -172,7 +172,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setExitPolicy(descriptor.getExitPolicyLines()); detailsStatus.setContact(descriptor.getContact()); detailsStatus.setPlatform(descriptor.getPlatform()); - detailsStatus.setFamily(descriptor.getFamilyEntries()); if (descriptor.getFamilyEntries() != null) { SortedSet<String> declaredFamily = new TreeSet<String>(); for (String familyMember : descriptor.getFamilyEntries()) { diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 6747c2c..8360a05 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -111,7 +111,6 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setExitPolicy(detailsStatus.getExitPolicy()); detailsDocument.setContact(detailsStatus.getContact()); detailsDocument.setPlatform(detailsStatus.getPlatform()); - detailsDocument.setFamily(detailsStatus.getFamily()); if (detailsStatus.getAllegedFamily() != null && !detailsStatus.getAllegedFamily().isEmpty()) { SortedSet<String> allegedFamily = new TreeSet<String>(); diff --git a/web/protocol.html b/web/protocol.html index eee99ba..98c3343 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -185,6 +185,8 @@ documents on August 13, 2015.</li> documents on August 25, 2015.</li> <li>3.0: Extended search parameter to match any 4 hex characters of a space-separated fingerprint on November 15, 2015.</li> +<li>3.1: Removed optional "family" field on January 18, +2016.</li> </ul> </div>  @@ -1179,7 +1181,7 @@ the relay did not report which version it runs. </li> <li> -family +family <code class="typeof">array of strings</code> optional @@ -1190,7 +1192,8 @@ relay part of their family, so that the effective family of this relay may be smaller. Omitted if empty or if descriptor containing this information cannot be found. -Deprecated on August 25, 2015. +Deprecated on August 25, 2015, removed on January 18, +2016. </li>

1 0

[onionoo/master] Stop returning code 500 when serving stale data.
by karsten＠torproject.org 18 Jan '16

18 Jan '16

commit 7c59c7c3ca336822aa424b31ae4d5eb6383c8026 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 10 09:48:50 2016 +0100 Stop returning code 500 when serving stale data. Until now, when the hourly updater has not run for 6 hours or more, the server responds to all queries with a 500 Internal Server Error. This seemed to be a good idea, because users would tell us when the hourly updater was broken and we could fix it. But actually, these 6 hours were chosen arbitrarily, and each application should decide for itself when it considers data as stale. That's why we're taking out the check and stopping to return a 500 status code because of potentially stale data. Implements #16907. --- .../java/org/torproject/onionoo/server/ResourceServlet.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 9b19d44..9aa460d 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -57,8 +57,7 @@ public class ResourceServlet extends HttpServlet { this.doGet(requestWrapper, responseWrapper); } - private static final long INDEX_MAX_AGE = 6L * 60L * 60L * 1000L, - CACHE_MIN_TIME = 5L * 60L * 1000L, + private static final long CACHE_MIN_TIME = 5L * 60L * 1000L, CACHE_MAX_TIME = 45L * 60L * 1000L, CACHE_INTERVAL = 5L * 60L * 1000L; @@ -84,10 +83,6 @@ public class ResourceServlet extends HttpServlet { NodeIndexerFactory.getNodeIndexer().getLastIndexed( INDEX_WAITING_TIME); long indexAgeMillis = nowMillis - indexWrittenMillis; - if (indexAgeMillis > INDEX_MAX_AGE) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - return; - } long cacheMaxAgeMillis = Math.max(CACHE_MIN_TIME, ((CACHE_MAX_TIME - indexAgeMillis) / CACHE_INTERVAL) * CACHE_INTERVAL);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2016