web47core 3.2.3.44 → 3.2.3.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adced90c2a22503ee987e0c720d5ea1e007f4fbc656dbc90bdc7fa7cf075ae8
-  data.tar.gz: 9e3018472076d431cccfa4009d08ab6bfdb91e5bad5e803cf11a3d3de913847f
+  metadata.gz: 5cb60aaf9b363d9d95a53e02cd2875e60b79f26344d64e08f6ba2ab8dce88e28
+  data.tar.gz: 383b9f556359a6578d06ea3b319c0382016e6638d2c914da04684d34a7c9d933
 SHA512:
-  metadata.gz: c8879b69e2ec9d801ee359c6be12100d80c6df3c45e849241acba09a17cc704049339b8fb68e6d4faf41c09e62ba60cc793d5ba21aca3dd4b7a0de0e644bd8ea
-  data.tar.gz: 1535db52112c0f4f5019fc3b5d9230ab284c3938f27093543f3142f344cc26a61f840fc6e33663b4ef9de242de10b3633f83532bc5e78c46b4fc9df3d6227a03
+  metadata.gz: 670ea6d949445923fe1a9ec0f0a9b27d48a9ad6a73ac5dd3050088e1adc13fc9393f7d67991826db3587a864319b112700c8bfd2fa761bcf47437c17c63810ff
+  data.tar.gz: 4565290e61d30d10a39be0584e7b6fe200fe76edfbf769f42e6e0c4af3544218a4be89b7049d6fe4d66237cca637f09e27511b184ef1827baa00d6abfa0fd5e7

data/app/controllers/status_controller.rb

@@ -4,6 +4,7 @@
 # Return the status of the server
 #
 class StatusController < ActionController::Base
+  helper SvgIconHelper
   protect_from_forgery with: :exception
   #
   # Main (and only) page
@@ -40,11 +41,11 @@ class StatusController < ActionController::Base
   def ui_decorators(components)
     components.each do |key, values|
       if values[:success]
-        components[key][:icon_name] = 'check_circle'
-        components[key][:icon_color] = 'green-text'
+        components[key][:icon_name] = 'circle-check'
+        components[key][:icon_color] = :green
       else
-        components[key][:icon_name] = 'error'
-        components[key][:icon_color] = 'red-text'
+        components[key][:icon_name] = 'circle-x'
+        components[key][:icon_color] = :red
       end
     end
   end

data/app/helpers/svg_icon_helper.rb

@@ -3,33 +3,25 @@
 module SvgIconHelper
   # @abstract Render the appropriate icon based on the name and type
   # @return [View]
-  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2)
+  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2, cached: true)
     return if name.blank?
 
+    unless cached
+      return fetch_svg_icon(name, size: size, type: type, classes: classes, color: color, stroke_width: stroke_width,
+                            cached: false)
+    end
+
     key = ['svg_icon', name, size.to_s, type.to_s, classes.to_s, color, stroke_width.to_s].join(':')
     Rails.cache.fetch(key, expires_in: 15.minutes) do
       fetch_svg_icon(name, size: size, type: type, classes: classes, color: color, stroke_width: stroke_width)
     end
   end
 
-  def fetch_svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2)
+  def fetch_svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2, cached: true)
     return if name.blank?
 
     classes = classes.compact.flatten.join(' ')
-    key = "icon_partial_path:#{name}:#{type}"
-    (partial, stroke) = Rails.cache.fetch(key, expires_in: 15.minutes) do
-      preferred_path = if I18n.exists?("nav.icons.#{name}")
-                         "icons/#{I18n.t("nav.icons.#{name}")}"
-                       else
-                         "icons/#{type}/#{name}"
-                       end
-      outline_path = "icons/outline/#{name}"
-      filled_path = "icons/filled/#{name}"
-
-      [preferred_path, outline_path, filled_path].collect do |path|
-        [preferred_path, color] if lookup_context.exists?(path, [], true)
-      end.compact.first
-    end
+    partial, stroke = icon_partial(name, type, color, cached: cached)
     if partial.blank?
       partial = 'icons/outline/bug'
       stroke = 'red'
@@ -42,6 +34,7 @@ module SvgIconHelper
             class: classes,
             fill: 'none',
             stroke: stroke,
+            style: "color: #{stroke}",
             'stroke-width': stroke_width,
             'stroke-linecap': 'round',
             'stroke-linejoin': 'round',
@@ -65,4 +58,23 @@ module SvgIconHelper
       render 'icons/outline/bug'
     end
   end
+
+  def icon_partial(name, type, color, cached:)
+    lookup = lambda do
+      preferred_path = if I18n.exists?("nav.icons.#{name}")
+                         "icons/#{I18n.t("nav.icons.#{name}")}"
+                       else
+                         "icons/#{type}/#{name}"
+                       end
+      outline_path = "icons/outline/#{name}"
+      filled_path = "icons/filled/#{name}"
+
+      [preferred_path, outline_path, filled_path].collect do |path|
+        [preferred_path, color] if lookup_context.exists?(path, [], true)
+      end.compact.first
+    end
+    return lookup.call unless cached
+
+    Rails.cache.fetch("icon_partial_path:#{name}:#{type}", expires_in: 15.minutes, &lookup)
+  end
 end

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

@@ -6,7 +6,6 @@
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes'}
     %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"
   %body{ style: 'background-color: #006064;'}
     %header
@@ -32,7 +31,6 @@
                     %td
                       %h4.flow-text=key.to_s.titleize
                     %td.center
-                      %i.material-icons.medium{class: value[:icon_color]}
-                        = value[:icon_name]
+                      = svg_icon(value[:icon_name], size: 32, color: value[:icon_color], cached: false)
                     %td.center.hide-on-small-only
                       %h4.flow-text.large=value[:message]

data/lib/app/services/auto_scaler.rb

@@ -5,10 +5,13 @@ require 'singleton'
 #
 # Resize the ECS worker service from the current thread.
 #
-# check runs after the primary cron server has launched due jobs.
-# warm_up raises the fleet to a floor. bump_worker adds one worker.
-# Neither call lowers a fleet that is already larger, except check when the
-# ladder maps the queue to zero workers.
+# check runs after the primary cron server has launched due jobs and follows
+# the worker ladder. It does not shrink the fleet while any job is still
+# queued, including when the ladder maps that depth to zero workers. It
+# scales to zero only when the queue is empty.
+# warm_up raises the fleet to at least the requested floor. bump_worker adds
+# one worker. Neither call consults the ladder or the queue, and neither
+# lowers a fleet that is already larger.
 #
 # A host project replaces the ladder at boot:
 #
@@ -59,21 +62,23 @@ class AutoScaler
   def check
     return unless configured?
 
-    apply_target(desired_for(delayed_jobs_count))
+    job_count = delayed_jobs_count
+    apply_target(desired_for(job_count), job_count: job_count)
   end
 
   #
-  # Raise the ECS desired count to at least min. Never lowers the fleet.
+  # Raise the ECS desired count to at least min. Ignores the ladder and the
+  # queue. Never lowers the fleet.
   #
   def warm_up(min: 1)
     return unless configured?
 
-    target = [[min.to_i, 1].max, max_worker_count].min
-    scale_to(target)
+    scale_to([min.to_i, 1].max)
   end
 
   #
-  # Add one worker to the live ECS desired count, capped at the ladder maximum.
+  # Add one worker to the live ECS desired count. Ignores the ladder and the
+  # queue.
   #
   def bump_worker
     return unless configured?
@@ -81,7 +86,7 @@ class AutoScaler
     current = live_desired_count
     return if current.nil?
 
-    scale_to([current + 1, max_worker_count].min, current: current)
+    scale_to(current + 1, current: current)
   end
 
   def reset
@@ -90,12 +95,22 @@ class AutoScaler
 
   private
 
-  def apply_target(target)
-    record_desired(target)
+  def apply_target(target, job_count:)
     current = live_desired_count
-    return if current.nil?
-    return if target.positive? && target <= current
-    return if target.zero? && current.zero?
+    if current.nil?
+      record_desired(target)
+      return
+    end
+
+    # Keep the live fleet while any job remains. The ladder still chooses a
+    # larger fleet. Scale down only once the queue is empty.
+    if job_count.positive? && target < current
+      record_desired(current)
+      return
+    end
+
+    record_desired(target)
+    return if target == current
 
     update_service(target)
   end
@@ -115,10 +130,6 @@ class AutoScaler
     worker_ladder.last.last
   end
 
-  def max_worker_count
-    worker_ladder.map(&:last).max
-  end
-
   def worker_ladder
     Web47core::Config.worker_ladder.presence || DEFAULT_WORKER_LADDER
   end

data/lib/web47core/version.rb

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

metadata

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