[whimsy] branch master updated: Drop obsolete members and board file references

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb 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 fd314b3  Drop obsolete members and board file references
fd314b3 is described below

commit fd314b32ac83ff443f3397723f2b039e3a30bfd5
Author: Sebb <se...@apache.org>
AuthorDate: Sat Jul 15 18:54:32 2017 +0100

    Drop obsolete members and board file references
---
 lib/whimsy/asf/mlist.rb | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/lib/whimsy/asf/mlist.rb b/lib/whimsy/asf/mlist.rb
index 89cf3fc..2397a67 100644
--- a/lib/whimsy/asf/mlist.rb
+++ b/lib/whimsy/asf/mlist.rb
@@ -11,22 +11,12 @@ module ASF
     
     # Return an array of board subscribers followed by the file update time
     def self.board_subscribers
-      # Allow for cutover to new cron jobs which only generate list-subs/list-mods
-      if isRecent(BOARD_SUBSCRIPTIONS)
-        return File.read(BOARD_SUBSCRIPTIONS).split("\n"), File.mtime(BOARD_SUBSCRIPTIONS)
-      else
-        return list_filter('sub', 'apache.org', 'board'), (File.mtime(LIST_TIME) rescue File.mtime(LIST_SUBS))
-      end
+      return list_filter('sub', 'apache.org', 'board'), (File.mtime(LIST_TIME) rescue File.mtime(LIST_SUBS))
     end
 
     # Return an array of members@ subscribers followed by the file update time
     def self.members_subscribers
-      # Allow for cutover to new cron jobs which only generate list-subs/list-mods
-      if isRecent(MEMBERS_SUBSCRIPTIONS) 
-        return File.read(MEMBERS_SUBSCRIPTIONS).split("\n"), File.mtime(MEMBERS_SUBSCRIPTIONS)
-      else
-        return list_filter('sub', 'apache.org', 'members'), (File.mtime(LIST_TIME) rescue File.mtime(LIST_SUBS))
-      end
+      return list_filter('sub', 'apache.org', 'members'), (File.mtime(LIST_TIME) rescue File.mtime(LIST_SUBS))
     end
 
     # return a hash of subscriptions for the list of emails provided
@@ -148,13 +138,6 @@ module ASF
       end
     end
 
-    # board and member subs details are part of LIST_SUBS
-    # however they are generated more frequently at present
-    # the files could be dropped if/when that changes
-    MEMBERS_SUBSCRIPTIONS = '/srv/subscriptions/members'
-
-    BOARD_SUBSCRIPTIONS = '/srv/subscriptions/board'
-    
     LIST_MODS = '/srv/subscriptions/list-mods'
 
     LIST_SUBS = '/srv/subscriptions/list-subs'

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