Skip to content

Commit

Permalink
Merge pull request #4 from avalonmediasystem/resque
Browse files Browse the repository at this point in the history
Resque and ResqueScheduler
  • Loading branch information
kdid authored Nov 10, 2016
2 parents 4bb6dda + 369c919 commit 93cd70f
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 11 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Avalon::About

Node classes for use with [about_page](https://github.com/sul-dlss/about_page) to
monitor [Avalon Media System](https://github.com/avalonmediasystem/avalon) components:
monitor [Avalon Media System](https://github.com/avalonmediasystem/avalon) components:

* Database connection
* Opencast Matterhorn server
* RTMP streaming server
* MediaInfo
* Delayed Job processes
* Resque processes

## Installation

Expand All @@ -33,3 +34,5 @@ of the additional node types provided by `Avalon::About`:
config.mediainfo = Avalon::About::MediaInfo.new(:version => '>=0.7.59')
config.streaming_server = Avalon::About::RTMPServer.new(streaming_server_host)
config.delayed_job = Avalon::About::DelayedJob.new(:min => 1)
config.resque = Avalon::About::Resque.new(::Resque)
config.resque_scheduler = Avalon::About::ResqueScheduler.new(::Resque::Scheduler)
22 changes: 12 additions & 10 deletions lib/avalon/about.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Copyright 2011-2013, The Trustees of Indiana University and Northwestern
# University. Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
#
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed
#
# Unless required by applicable law or agreed to in writing, software distributed
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
# --- END LICENSE_HEADER BLOCK ---

Expand All @@ -18,10 +18,12 @@

module Avalon
module About
autoload :Database, "avalon/about/database"
autoload :DelayedJob, "avalon/about/delayed_job"
autoload :Matterhorn, "avalon/about/matterhorn"
autoload :MediaInfo, "avalon/about/media_info"
autoload :RTMPServer, "avalon/about/rtmp_server"
autoload :Database, "avalon/about/database"
autoload :DelayedJob, "avalon/about/delayed_job"
autoload :Matterhorn, "avalon/about/matterhorn"
autoload :MediaInfo, "avalon/about/media_info"
autoload :Resque, "avalon/about/resque"
autoload :ResqueScheduler, "avalon/about/resque_scheduler"
autoload :RTMPServer, "avalon/about/rtmp_server"
end
end
39 changes: 39 additions & 0 deletions lib/avalon/about/resque.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Copyright 2011-2013, The Trustees of Indiana University and Northwestern
# University. Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
# --- END LICENSE_HEADER BLOCK ---

module Avalon
module About
class Resque < AboutPage::Configuration::Node
render_with 'generic_hash'

validates_each :connected? do |record, attr, value|
record.errors.add attr, ": Resque.redis.ping did not return 'PONG'" unless value
end

def initialize(resque)
@resque = resque
end

def connected?
@resque.redis.ping == "PONG"
rescue
false
end

def to_h
@resque.info
end
end
end
end
45 changes: 45 additions & 0 deletions lib/avalon/about/resque_scheduler.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Copyright 2011-2013, The Trustees of Indiana University and Northwestern
# University. Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
# --- END LICENSE_HEADER BLOCK ---

module Avalon
module About
class ResqueScheduler < AboutPage::Configuration::Node
render_with 'generic_hash'

validates_each :reachable? do |record, attr, value|
record.errors.add attr, " == false" unless value
end

def initialize(resque_scheduler)
@resque_scheduler = resque_scheduler
@resque = @resque_scheduler.parent
end

def reachable?
!@resque.redis.get(@resque_scheduler.master_lock.key).nil?
rescue
false
end

def to_h
{
'server environment' => @resque_scheduler.env,
'current master' => @resque_scheduler.master_lock.value
}
rescue
{}
end
end
end
end

0 comments on commit 93cd70f

Please sign in to comment.