Skip to content

Commit

Permalink
Merge pull request #5486 from avalonmediasystem/about_page_update
Browse files Browse the repository at this point in the history
Check sidekiq and redis status on about page
  • Loading branch information
cjcolvar authored Dec 1, 2023
2 parents 83ad1fe + 7111483 commit 2f69afe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ gem 'active_annotations', '~> 0.4'
gem 'activerecord-session_store', '>= 2.0.0'
gem 'acts_as_list'
gem 'api-pagination'
gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git', tag: 'avalon-r6.4'
gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git', ref: 'e8dc8df'
#gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
gem 'bootstrap-toggle-rails'
gem 'bootstrap_form'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ GIT

GIT
remote: https://github.com/avalonmediasystem/avalon-about.git
revision: 8ae33197219cb6cb8b6fee1f616950c29f2b94ce
tag: avalon-r6.4
revision: e8dc8df0e7576c95c71bce1280c1ecb787c28197
ref: e8dc8df
specs:
avalon-about (0.1.0)
about_page
Expand Down
2 changes: 2 additions & 0 deletions config/initializers/about_page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
config.database = Avalon::About::Database.new(User)
config.mediainfo = Avalon::About::MediaInfo.new(:version => '>=0.7.59')
config.streaming_server = Avalon::About::HLSServer.new(Settings.streaming.http_base)
config.sidekiq = Avalon::About::Sidekiq.new(numProcesses: 1)
config.redis = Avalon::About::Redis.new(Redis.new(Rails.application.config.cache_store[1]))
config.git_log = AboutPage::GitLog.new(limit: 15) if Rails.env.development?
config.dependencies = AboutPage::Dependencies.new
end

0 comments on commit 2f69afe

Please sign in to comment.