web47core 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ca49b23de02bb0334025734b0616e2a99a4c13cebd882195fffdcfb06f51ec
-  data.tar.gz: 5f0a329a5ff30a79edf739e44d84f43846cf27e385dcd87f421f008871ed3335
+  metadata.gz: 0df839ec2a6e7d78c8ef4e250179643a359e0b5723b35992ab4dfda76ccd1886
+  data.tar.gz: 31b961889cc2bf8748da8b2ea26d050a20fed870adfdcc68a5e8bce1f0e67409
 SHA512:
-  metadata.gz: 13750d4f9b2a249b8e1448c83f7e5dca0a42a78bba268e8de7f6467faa52d9b73feca83a991cc665305b7edd93f1883818741cf9189d4d8285ff5f4acbd6df4a
-  data.tar.gz: 4d7e3e1378637aa08b0ac7e60b984a0faf743ebdab1af52fbc43dfcf5f6ace391882647de5b94567b713f7648ed3feff45e3e751e159e401f2e235af93b9a9b3
+  metadata.gz: 3fe114893789eee1c74a7f0c8870c4669feb38d8d67010b9425634b20910c7bce0bbd5825c3f0fe3e65eb4f58fabf8c49b390b868fa6f0c8bb8ee3821fcf7c4d
+  data.tar.gz: ba5626fdb74f667f55c992d84253026e8a50679552d7c4447d3832cfcbe05bbe26e84c4900ed23159a7cdc873149b6769e6d27aee559312f1aeedcfb0dcfc26f

data/app/controllers/status_controller.rb

@@ -4,36 +4,62 @@
 # Return the status of the server
 #
 class StatusController < ActionController::Base
+  protect_from_forgery with: :exception
   #
   # Main (and only) page
   #
   def index
-    components = { mongo: mongo_status, redis: redis_status, job_count: job_count_status, cron_job: cron_job_status }
+    components = { mongo: mongo_status,
+                   redis: redis_status,
+                   jobs: delayed_jobs_status,
+                   cron_job_servers: cron_job_servers_status,
+                   workers: workers_status }
 
     respond_to do |format|
-      format.html { render :index, locals: { components: components }, layout: false }
+      format.html { render :index, locals: { components: ui_decorators(components) }, layout: false }
       format.json { render json: components.to_json }
-      format.text do
-        overall = components.collect { |_key, item| item[:success] }.all?
-        render plain: components.flatten, status: overall ? 200 : 500
-      end
+      format.text { render plain: components.flatten, status: text_status(components) }
     end
   end
 
   private
 
+  #
+  # Return the status of the key components, mongo, redis
+  #
+  def text_status(components)
+    components[:mongo][:success] && components[:redis][:success] ? 200 : 500
+  rescue StandardError
+    500
+  end
+
+  #
+  # Add UI decorators for HTML formatting
+  #
+  def ui_decorators(components)
+    components.each do |key, values|
+      if values[:success]
+        components[key][:icon_name] = 'check_circle'
+        components[key][:icon_color] = 'green-text'
+      else
+        components[key][:icon_name] = 'error'
+        components[key][:icon_color] = 'red-text'
+      end
+    end
+  end
+
   #
   # Report an error for the check
   #
-  def report_error(error)
-    { success: false, icon_name: 'error', icon_color: 'red-text', message: error.message }
+  def report_error(error, metrics = {})
+    metrics.merge(success: false, message: error.message)
   end
 
   #
   # Report a success for the check
   #
-  def report_success(message)
-    { success: true, icon_name: 'check_circle', icon_color: 'green-text', message: message }
+  def report_success(message, metrics = {})
+    metrics.merge(success: true, message: message)
   end
 
   #
@@ -42,9 +68,9 @@ class StatusController < ActionController::Base
   def mongo_status
     raise 'Mongo not available' if SystemConfiguration.count.zero?
 
-    report_success "#{SystemConfiguration.count} Configs"
+    report_success "#{SystemConfiguration.count} Configs", count: SystemConfiguration.count
   rescue StandardError => error
-    report_error(error)
+    report_error error, count: 0
   end
 
   #
@@ -55,32 +81,53 @@ class StatusController < ActionController::Base
     Rails.cache.write 'redis-status-check', value
     raise 'Redis not available' unless value.eql?(Rails.cache.fetch('redis-status-check'))
 
-    report_success 'Redis Available'
+    report_success 'Redis Available', count: 1
   rescue StandardError => error
-    report_error(error)
+    report_error(error, count: 0)
   end
 
   #
   # Job Count
   #
-  def job_count_status
-    report_success "#{Delayed::Backend::Mongoid::Job.count} Jobs"
+  def delayed_jobs_status
+    count = Delayed::Backend::Mongoid::Job.count
+    report_success "#{count} Jobs", count: count
   rescue StandardError => error
     report_error(error)
   end
 
   #
-  # Cron job status
+  # Cron job primary status
   #
-  def cron_job_status
-    server = Cron::Server.primary_server
+  def cron_job_servers_status
+    server = cron_job_server
     raise 'No primary server' if server.blank?
 
     server_info = "#{server.host_name}(#{server.pid}), last check in #{server.last_check_in_at}"
     raise "Primary Server is DEAD: #{server_info}" if server.dead?
 
-    report_success "Primary Server is alive: #{server_info}"
+    report_success "Primary Server is alive: #{server_info}",
+                   primary_count: 1,
+                   total_count: Cron::Server.count
   rescue StandardError => error
-    report_error(error)
+    report_error(error, primary_count: 0, total_count: Cron::Server.count)
+  end
+
+  #
+  # Desired and current worker status for servers
+  #
+  def workers_status
+    server = cron_job_server
+    raise 'No primary server' if server.blank? || server.dead?
+
+    report_success "Workers #{server.desired_server_count}/ #{server.current_server_count}",
+                   desired_count: server.desired_server_count,
+                   current_count: server.current_server_count
+  rescue StandardError => error
+    report_error(error, desired_count: 0, current_count: 0)
+  end
+
+  def cron_job_server
+    @cron_job_server ||= Cron::Server.primary_server
   end
 end

data/app/helpers/core_helper.rb

@@ -91,8 +91,4 @@ module CoreHelper
   def edit_model_path(model)
     model_action_path(model, :edit)
   end
-
-  def current_user
-    User.new
-  end
 end

data/app/views/status/index.html.haml

@@ -7,7 +7,7 @@
     %meta{ name: 'apple-mobile-web-app-status-bar-style', content: 'black'}
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css'
     = stylesheet_link_tag 'https://fonts.googleapis.com/icon?family=Material+Icons'
-    %title "#{Rails.env} Status"
+    %title="#{Rails.env} Status"
   %body{ style: 'background-color: #006064;'}
     %header
     %main

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Chris Schroeder