[whimsy] branch master updated: Unnecessary check

[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 943e034  Unnecessary check
943e034 is described below

commit 943e034df3f0b09bc959ffbbf3c2a428b42cd3be
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jan 11 11:16:47 2019 +0000

    Unnecessary check
---
 www/status/monitors/system.rb | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/www/status/monitors/system.rb b/www/status/monitors/system.rb
index 8228712..fa3f335 100644
--- a/www/status/monitors/system.rb
+++ b/www/status/monitors/system.rb
@@ -54,18 +54,19 @@ def Monitor.system(previous_status)
   status[name] = {level: master == true ? 'success' : 'warning',
                   data: master.to_s}
 
-  # Is ASF::LDAP.hosts up to date?
-  require_relative '../../../lib/whimsy/asf'
-  name = :ldap
-  pls = ASF::LDAP.puppet_ldapservers.sort
-  hosts = ASF::LDAP::RO_HOSTS.sort
-  diff = (pls-hosts).map {|host| "+ #{host}"}
-  diff += (hosts-pls).map {|host| "- #{host}"}
-  if diff.empty?
-    status[name] = {level: 'success', data: hosts}
-  else
-    status[name] = {level: 'warning', data: diff}
-  end
+# No longer relevant as we use standard alias names
+#  # Is ASF::LDAP.hosts up to date?
+#  require_relative '../../../lib/whimsy/asf'
+#  name = :ldap
+#  pls = ASF::LDAP.puppet_ldapservers.sort
+#  hosts = ASF::LDAP::RO_HOSTS.sort
+#  diff = (pls-hosts).map {|host| "+ #{host}"}
+#  diff += (hosts-pls).map {|host| "- #{host}"}
+#  if diff.empty?
+#    status[name] = {level: 'success', data: hosts}
+#  else
+#    status[name] = {level: 'warning', data: diff}
+#  end
 
   {data: status}
 end