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 09bc8a36 Rename to avoid collision with Ruby Monitor class
09bc8a36 is described below
commit 09bc8a36f28d5ef12ddfb4be038ef14dd52dc435
Author: Sebb <[email protected]>
AuthorDate: Tue Aug 27 12:08:10 2024 +0100
Rename to avoid collision with Ruby Monitor class
---
www/status/README.md | 2 +-
www/status/index.cgi | 2 +-
www/status/monitor.rb | 6 +++---
www/status/monitors/board_minutes.rb | 4 ++--
www/status/monitors/git.rb | 4 ++--
www/status/monitors/mail_jobs.rb | 2 +-
www/status/monitors/public_json.rb | 2 +-
www/status/monitors/secmail.rb | 2 +-
www/status/monitors/site_scan.rb | 2 +-
www/status/monitors/svn.rb | 4 ++--
www/status/monitors/system.rb | 2 +-
www/status/monitors/unit_test.rb | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/www/status/README.md b/www/status/README.md
index bd89640a..f1909baa 100644
--- a/www/status/README.md
+++ b/www/status/README.md
@@ -83,7 +83,7 @@ can be done either by browsers or pings, results in a call to
If it has been more than 60 seconds since the last status update, index.cgi
will call
[monitor.rb](https://github.com/apache/whimsy/blob/master/www/status/monitor.rb).
-Monitor.rb will load and then call each of the monitors defined in the
+StatusMonitor.rb will load and then call each of the monitors defined in the
[monitors](https://github.com/apache/whimsy/tree/master/www/status/monitors)
subdirectory.
diff --git a/www/status/index.cgi b/www/status/index.cgi
index e6dc5a88..d2795434 100755
--- a/www/status/index.cgi
+++ b/www/status/index.cgi
@@ -12,7 +12,7 @@ status = JSON.parse(File.read(json)) rescue {}
if not status[:mtime] or Time.now - Time.parse(status[:mtime]) > 60
begin
require_relative './monitor'
- status = Monitor.new.status || {}
+ status = StatusMonitor.new.status || {}
rescue Exception => e
print "Status: 500 Internal Server Error\r\n"
print "Context-Type: text/plain\r\n\r\n"
diff --git a/www/status/monitor.rb b/www/status/monitor.rb
index 13dcf2fa..a1c849c4 100644
--- a/www/status/monitor.rb
+++ b/www/status/monitor.rb
@@ -26,7 +26,7 @@ if __FILE__ == $0
require 'whimsy/asf/status'
end
-class Monitor
+class StatusMonitor
# match http://getbootstrap.com/components/#alerts
LEVELS = %w(success info warning danger fatal)
@@ -58,7 +58,7 @@ class Monitor
begin
# invoke method to determine current status
previous = baseline[:data][method.to_sym] || {mtime: Time.at(0)}
- status = Monitor.send(method, previous) || previous
+ status = StatusMonitor.send(method, previous) || previous
# convert non-hashes in proper statuses
if not status.instance_of? Hash
@@ -193,5 +193,5 @@ end
# for debugging purposes
if __FILE__ == $0
- puts JSON.pretty_generate(Monitor.new(ARGV).status)
+ puts JSON.pretty_generate(StatusMonitor.new(ARGV).status)
end
diff --git a/www/status/monitors/board_minutes.rb
b/www/status/monitors/board_minutes.rb
index 0563e976..7fdfa65e 100644
--- a/www/status/monitors/board_minutes.rb
+++ b/www/status/monitors/board_minutes.rb
@@ -16,7 +16,7 @@ Fatal - log or index are not present/readable (status level
is generated by call
require 'time'
-def Monitor.board_minutes(previous_status)
+def StatusMonitor.board_minutes(previous_status)
index = File.expand_path('../../www/board/minutes/index.html')
log = File.read(File.expand_path('../../www/logs/collate_minutes'))
@@ -41,4 +41,4 @@ end
if __FILE__ == $0
require_relative 'unit_test'
runtest('board_minutes') # must agree with method name above
-end
\ No newline at end of file
+end
diff --git a/www/status/monitors/git.rb b/www/status/monitors/git.rb
index 47120893..856047dd 100644
--- a/www/status/monitors/git.rb
+++ b/www/status/monitors/git.rb
@@ -16,7 +16,7 @@ require 'fileutils'
SUMMARY_RE = %r{^ \d+ files? changed(, \d+ insertions?\(\+\))?(, \d+
deletions?\(-\))?$}
-def Monitor.git(previous_status)
+def StatusMonitor.git(previous_status)
logdir = File.expand_path('../../../logs', __FILE__)
log = File.join(logdir, 'git-pull')
@@ -145,7 +145,7 @@ end
# for debugging purposes
if __FILE__ == $0
- response = Monitor.git(nil) # must agree with method name above
+ response = StatusMonitor.git(nil) # must agree with method name above
data = response[:data]
data.each do |k,v|
puts "#{k} #{data[k][:level]} #{data[k][:title] or data[k][:data] }"
diff --git a/www/status/monitors/mail_jobs.rb b/www/status/monitors/mail_jobs.rb
index 43397898..6e3f4c91 100644
--- a/www/status/monitors/mail_jobs.rb
+++ b/www/status/monitors/mail_jobs.rb
@@ -16,7 +16,7 @@ Danger - File more than 24 hours old or Exception while
processing
require 'fileutils'
require 'time'
-def Monitor.mail_jobs(previous_status)
+def StatusMonitor.mail_jobs(previous_status)
danger_period = 86_400 # one day
diff --git a/www/status/monitors/public_json.rb
b/www/status/monitors/public_json.rb
index 22bfae1b..8aef674b 100644
--- a/www/status/monitors/public_json.rb
+++ b/www/status/monitors/public_json.rb
@@ -17,7 +17,7 @@ Danger - File more than 24 hours old or Exception while
processing
require 'fileutils'
require 'time'
-def Monitor.public_json(previous_status)
+def StatusMonitor.public_json(previous_status)
danger_period = 86_400 # one day
warning_period = 5400 # 1.5 hours
diff --git a/www/status/monitors/secmail.rb b/www/status/monitors/secmail.rb
index 0e3f9e59..92b9ce33 100644
--- a/www/status/monitors/secmail.rb
+++ b/www/status/monitors/secmail.rb
@@ -4,7 +4,7 @@
require 'time'
-def Monitor.secmail(previous_status)
+def StatusMonitor.secmail(previous_status)
log = '/srv/mail/procmail.log'
{mtime: File.mtime(log).gmtime.iso8601, level: 'success'} # to agree with
normalise
diff --git a/www/status/monitors/site_scan.rb b/www/status/monitors/site_scan.rb
index d2cca96d..5a3d4f62 100644
--- a/www/status/monitors/site_scan.rb
+++ b/www/status/monitors/site_scan.rb
@@ -14,7 +14,7 @@ Info - log is recent and contains only expected content
require 'time'
-def Monitor.site_scan(previous_status)
+def StatusMonitor.site_scan(previous_status)
logdir = File.expand_path('../../www/logs')
logfile = File.join(logdir, 'site-scan')
log = File.read(logfile)
diff --git a/www/status/monitors/svn.rb b/www/status/monitors/svn.rb
index 363acf61..3f821a0d 100644
--- a/www/status/monitors/svn.rb
+++ b/www/status/monitors/svn.rb
@@ -18,7 +18,7 @@ require 'fileutils'
# Match revision messages
REV_RE = %r{^(Checked out|\s*Updated ('[^']+' )?to|At|List updated from \d+
to|List is at) (revision |r)\d+\s*\.$}
-def Monitor.svn(previous_status)
+def StatusMonitor.svn(previous_status)
logdir = File.expand_path('../../../logs', __FILE__)
archive = File.join(logdir,'archive')
FileUtils.mkdir(archive) unless File.directory?(archive)
@@ -101,7 +101,7 @@ end
# for debugging purposes
if __FILE__ == $0
if ARGV.first == '__DATA__'
- response = Monitor.svn(nil) # must agree with method name above
+ response = StatusMonitor.svn(nil) # must agree with method name above
data = response[:data]
data.each do |k,v|
puts "#{k} #{data[k][:level]} #{data[k][:title]} #{data[k][:data]}"
diff --git a/www/status/monitors/system.rb b/www/status/monitors/system.rb
index f326028e..04da189c 100644
--- a/www/status/monitors/system.rb
+++ b/www/status/monitors/system.rb
@@ -5,7 +5,7 @@
require 'time'
-def Monitor.system(previous_status)
+def StatusMonitor.system(previous_status)
name=:puppet
status = {}
status[name] = {
diff --git a/www/status/monitors/unit_test.rb b/www/status/monitors/unit_test.rb
index 2ba91c5b..6201c498 100644
--- a/www/status/monitors/unit_test.rb
+++ b/www/status/monitors/unit_test.rb
@@ -9,7 +9,7 @@ def runtest(method_name)
baseline = JSON.parse(File.read(status_file),{symbolize_names: true}) rescue
{}
baseline[:data] = {} unless baseline[:data].instance_of? Hash
previous = baseline[:data][method_name.to_sym] || {mtime: Time.at(0)}
- response = Monitor.send(method_name, previous)
+ response = StatusMonitor.send(method_name, previous)
if response == previous
puts "No change in response"
elsif response[:data] and response[:data] == previous[:data]
