web47core 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fa89fdcd38c923f6fde1827baa6d3237f43120e9e82c25f9c13cc7817e580a
-  data.tar.gz: d25bd53993294c31e1a6f89ce6cffe76c38bd0058411c97c2f4027418a37be43
+  metadata.gz: 030670e1f995d60e8bf25b1fb67c9bd91a628e859225114fcfe6203f3c77e818
+  data.tar.gz: 7db5d7cbaa718e3a296b209bf4c5e3b943441958c0019601ec031972803f6a09
 SHA512:
-  metadata.gz: 1b9b6f4ed7fef7b154e7622f664c2c93bfbd6e26524523befd9b764d3d1f72525b06243b91e8c3fac057230dfff5f659017db4893b123665353e994c3cee2dad
-  data.tar.gz: ca8ecfac41f5bd5df4d766d48ad6823550d7fbbb62413c3820011edb151e59d5557edd18f4e967507a539fcd2731bd8198e5b352f3f6c546d95d376d034316e9
+  metadata.gz: d9dedd01621102e871fd5f6f19b99f46ff331788d1feba24095daf10f023c058ed61a1b7cd654e8d965c478954e41e3e53ee2c39e33efc3f46f3f4d36233e038
+  data.tar.gz: 1e77420c64920f5ffde02efa94def8a5d57d3832ebbff25177b80d9253949fbd26049b6e95fc952e7b5da415d9ab33d835e8e29f8032492dc888696134c806fc

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/app/models/concerns/search_able.rb

@@ -39,6 +39,16 @@ module SearchAble
     end
   end
 
+  #
+  # Place holder to call to allow for work to be done before we gather up search text fields
+  #
+  def before_search_text; end
+
+  #
+  # Place holder to call to allow for work to be done after we gather up search text fields
+  #
+  def after_search_text; end
+
   #
   # Internal: Update the search and sort text
   #
@@ -47,8 +57,10 @@ module SearchAble
   def update_search_and_sort_text
     return if destroyed?
 
+    before_search_text
     update_text(search_fields, :search_text)
     update_text(sort_fields, :sort_text)
+    after_search_text
   end
 
   #
@@ -69,6 +81,8 @@ module SearchAble
         value.to_s.rjust(4, '0')
       when Array
         value.empty? ? nil : value.join(' ').downcase
+      when Hash
+        value.inspect
       else
         value.to_s
       end

data/lib/app/models/email_notification.rb

@@ -110,6 +110,7 @@ class EmailNotification < Notification
       mail.delivery_method :smtp, smtp_configuration
     end
 
+    mail.header['X-Mailgun-Native-Send'] = 'yes' if SystemConfiguration.mail_gun_configured?
     # Deliver it
     mail.deliver
   rescue StandardError => error
@@ -138,8 +139,8 @@ class EmailNotification < Notification
   # sender address
   #
   def sender_address
-    address = SystemConfiguration.smtp_user_name
-    unless account.nil?
+    address = SystemConfiguration.support_email
+    if account.present?
       account_smtp = account.fetch_smtp_configuration
       address = account_smtp.username if account_smtp.use?
     end

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport