[whimsy] branch master updated: handle multi-word committee names, and names with dashes

2017-08-09 Thread rubys
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 0308ca2  handle multi-word committee names, and names with dashes
0308ca2 is described below

commit 0308ca2f5b4d118d42f87a205acc74d0418bdf78
Author: Sam Ruby 
AuthorDate: Wed Aug 9 20:16:56 2017 -0400

handle multi-word committee names, and names with dashes
---
 www/status/monitors/site_scan.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/status/monitors/site_scan.rb b/www/status/monitors/site_scan.rb
index 0836b5e..bef9dea 100644
--- a/www/status/monitors/site_scan.rb
+++ b/www/status/monitors/site_scan.rb
@@ -18,7 +18,7 @@ def Monitor.site_scan(previous_status)
   logfile = File.expand_path('../../www/logs/site-scan')
   log = File.read(logfile)
 
-  log.gsub! /\w+ https?:\S+ \w+\n/, ''
+  log.gsub! /^([-\w]+ )*https?:\S+ \w+\n/, ''
 
   danger_period = 86_400 # one day
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" '].


[whimsy] branch master updated: see if we can recover from site-scan timeouts

2017-08-09 Thread rubys
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 55980c0  see if we can recover from site-scan timeouts
55980c0 is described below

commit 55980c05bb52d947294865135307d775afb5a397
Author: Sam Ruby 
AuthorDate: Wed Aug 9 10:37:36 2017 -0400

see if we can recover from site-scan timeouts
---
 lib/whimsy/cache.rb | 4 
 1 file changed, 4 insertions(+)

diff --git a/lib/whimsy/cache.rb b/lib/whimsy/cache.rb
index 10d06a8..ef97955 100644
--- a/lib/whimsy/cache.rb
+++ b/lib/whimsy/cache.rb
@@ -118,6 +118,10 @@ class Cache
 return uri, response
   end
 end
+  rescue Net::OpenTimeout
+# retry timeouts (essentially treat them as self redirects)
+raise if depth >= 5
+fetch(uri, options, depth+1)
   end
 
   # File cache contains last modified followed by the data

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" '].