commit 00b6475f966162074b7b8f9307c7a3d4e01af13b Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Tue May 16 16:30:35 2017 +0200 Update resource pattern for update pings. Issue spotted by Lunar, fix suggested by boklm. --- modules/webstats/src/main/resources/init-webstats.sql | 4 ++-- website/src/main/resources/web/WEB-INF/stats.jsp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/webstats/src/main/resources/init-webstats.sql b/modules/webstats/src/main/resources/init-webstats.sql index 98bb758..5c23176 100644 --- a/modules/webstats/src/main/resources/init-webstats.sql +++ b/modules/webstats/src/main/resources/init-webstats.sql @@ -66,7 +66,7 @@ CREATE OR REPLACE VIEW webstats AS NULL::BOOLEAN AS incremental, SUM(count) AS count FROM files NATURAL JOIN requests NATURAL JOIN resources - WHERE resource_string LIKE '%/torbrowser/update_2/%' + WHERE resource_string LIKE '%/torbrowser/update\__/%' AND resource_string NOT LIKE '%.xml' AND response_code = 200 AND method = 'GET' @@ -122,7 +122,7 @@ CREATE OR REPLACE VIEW webstats AS NULL::BOOLEAN AS incremental, SUM(count) AS count FROM files NATURAL JOIN requests NATURAL JOIN resources - WHERE resource_string LIKE '%/tormessenger/update_2/%' + WHERE resource_string LIKE '%/tormessenger/update\__/%' AND resource_string NOT LIKE '%.xml' AND resource_string NOT LIKE '%/' AND resource_string NOT LIKE '%/?' diff --git a/website/src/main/resources/web/WEB-INF/stats.jsp b/website/src/main/resources/web/WEB-INF/stats.jsp index 8926b16..90b9c3b 100644 --- a/website/src/main/resources/web/WEB-INF/stats.jsp +++ b/website/src/main/resources/web/WEB-INF/stats.jsp @@ -512,10 +512,10 @@ fraction.</li> <ul> <li><b>"tbid":</b> Tor Browser initial downloads: GET requests to all sites with resource strings <code>'%/torbrowser/%.exe'</code>, <code>'%/torbrowser/%.dmg'</code>, and <code>'%/torbrowser/%.tar.xz'</code> and response code 200.</li> <li><b>"tbsd":</b> Tor Browser signature downloads: GET requests to all sites with resource strings <code>'%/torbrowser/%.exe.asc'</code>, <code>'%/torbrowser/%.dmg.asc'</code>, and <code>'%/torbrowser/%.tar.xz.asc'</code> and response code 200.</li> -<li><b>"tbup":</b> Tor Browser update pings: GET requests to all sites with resource strings <code>'%/torbrowser/update_2/%'</code> and response code 200.</li> +<li><b>"tbup":</b> Tor Browser update pings: GET requests to all sites with resource strings <code>'%/torbrowser/update\__/%'</code> and response code 200.</li> <li><b>"tbur":</b> Tor Browser update requests: GET requests to all sites with resource strings <code>'%/torbrowser/%.mar'</code> and response code 302.</li> <li><b>"tmid":</b> Tor Messenger initial downloads: GET requests to all sites with resource strings <code>'%/tormessenger/%.exe'</code>, <code>'%/tormessenger/%.dmg'</code>, and <code>'%/tormessenger/%.tar.xz'</code> and response code 200.</li> -<li><b>"tmup":</b> Tor Messenger update pings: GET requests to all sites with resource strings <code>'%/tormessenger/update_2/%'</code> and response code 200.</li> +<li><b>"tmup":</b> Tor Messenger update pings: GET requests to all sites with resource strings <code>'%/tormessenger/update\__/%'</code> and response code 200.</li> <li><b>"twhph":</b> Tor website home page hits: GET requests to sites <code>'torproject.org'</code> and <code>'www.torproject.org'</code> with resource strings <code>'/'</code> and <code>'/index%'</code> and response code 200.</li> <li><b>"twdph":</b> Tor website download page hits: GET requests to sites <code>'torproject.org'</code> and <code>'www.torproject.org'</code> with resource strings <code>'/download/download%'</code> and <code>'/projects/torbrowser.html%'</code> and response code 200.</li> </ul>