web47core 3.2.3.1 → 3.2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd88813680f4b954ca7f7989d94d7c812684f0b38318f26098b9202dc4af5fe6
-  data.tar.gz: 7611ff98b75954c64687df26960259ba82d1b79652afd644953952ee04a96bd0
+  metadata.gz: 2b92b99e81e9fe10ed19f01ec7dcdd2d949b23530b42e7b59f9657ec36cb6f99
+  data.tar.gz: e4def330da1ef103c2bb3fba322b8620957ef7644115ace307d0a0ff89b38a5d
 SHA512:
-  metadata.gz: bb8312761cae0d617cbb08a6356a24ec571e3ba13b21ddfa038c6187b042aa1f3244c9a8deefd1d28c4e029d1c9326f0a04e33b2ebbe38a7d4989ce4de4a9035
-  data.tar.gz: 7ed3840403c8d51b29d1f7bbcdc1c49212154ad645105a3be113d2e9a57a9c39547eeec575aa8c7b63d2d47c3132f33b917b879611e5d22ce81556dc542637dc
+  metadata.gz: 4a4fd7f1be5bab10b325337cdf8a3504e1fa39ac147a0894a41922ce52cdc6f160f59e800bc68ab3557157daf0a60d0325c2b72e34a3fa858726e9f03f040302
+  data.tar.gz: 3a2219fac645965efa6c5434571b9b368fb8dfc6ca0ca481b6b7cbc2b9bea38824b10c9d4623deaa8066eae397393ce706de5d75ea84a410dd9a9385466379fe

data/lib/app/jobs/cron/server.rb

@@ -153,22 +153,13 @@ module Cron
     def check_auto_scale
       return unless auto_scaling_configured?
 
-      if delayed_jobs_count.eql?(0)
+      if delayed_jobs_count.zero?
         handle_zero_job_count
       else
         handle_auto_scale_jobs
       end
     end
 
-    #
-    # Returns the AWS AutoScaling Client
-    #
-    def client
-      @client ||= Aws::AutoScaling::Client.new(access_key_id: sys_config.aws_access_key_id,
-                                               secret_access_key: sys_config.aws_secret_access_key,
-                                               region: sys_config.aws_region)
-    end
-
     def sys_config
       @sys_config ||= SystemConfiguration.configuration
     end
@@ -191,29 +182,27 @@ module Cron
       false
     end
 
-    #
-    # Returns the AutoScalingGroup associated with the account
-    #
-    def auto_scaling_group
-      filter = { auto_scaling_group_names: [sys_config.aws_auto_scaling_group_name] }
-      @auto_scaling_group ||= client.describe_auto_scaling_groups(filter).auto_scaling_groups.first
+    # @abstract Returns the AWS ECS service
+    # @return [Aws::ECS::Types::Service]
+    def ecs_service
+      filter = { cluster: sys_config.aws_ecs_cluster_worker_name, services: [sys_config.aws_ecs_service_worker_name] }
+      @ecs_service ||= ecs_client.describe_services(filter).services.first
     end
 
-    #
-    # Returns a count of the Delayed Jobs in queue that have not failed
-    #
+    # @abstract Returns a count of the Delayed Jobs in queue that have not failed
+    # @return [Integer]
     def delayed_jobs_count
       @delayed_jobs_count ||= Delayed::Backend::Mongoid::Job.where(failed_at: nil).read(mode: :primary).count
     end
 
-    #
-    # Returns the current value of 'desired capacity' for the AutoScalingGroup
-    #
+    # @abstract Returns the current value of 'desired capacity' for the ECS Service
+    # @return [Integer]
     def current_desired_capacity
-      current = auto_scaling_group.desired_capacity
+      current = ecs_service.desired_count
       set current_server_count: current
       current
     rescue StandardError
+      puts 'error on desirect capacy'
       0
     end
 
@@ -221,7 +210,7 @@ module Cron
     # Calls the 'auto_scale' method with a 'desired_count' of 0 unless the capacity is already at 0
     #
     def handle_zero_job_count
-      return if current_desired_capacity.eql?(0)
+      return if current_desired_capacity.zero?
 
       auto_scale
     end
@@ -231,29 +220,33 @@ module Cron
     # We don't need any more workers if the job count is less than 1,000
     #
     def handle_auto_scale_jobs
-      return if delayed_jobs_count < 50
+      return if delayed_jobs_count.zero?
 
       case delayed_jobs_count
-      when 50..250
+      when 1..50
         auto_scale(1)
-      when 251..500
+      when 51..200
         auto_scale(2)
-      when 501..1_000
+      when 201..500
         auto_scale(3)
-      when 1_001..2_000
+      when 501..1_000
         auto_scale(4)
-      when 2_001..3_999
+      when 1_001..2_000
         auto_scale(4)
-      when 4_000..7_999
+      when 2_001..3_000
         auto_scale(5)
-      when 8_000..10_999
+      when 3_001..4_000
         auto_scale(5)
-      when 11_000..13_999
-        auto_scale(6)
-      when 14_000..17_999
+      when 4_001..6_000
         auto_scale(6)
-      else
+      when 6_001..8_000
         auto_scale(7)
+      when 8_001..10_000
+        auto_scale(8)
+      when 10_001..13_000
+        auto_scale(9)
+      else
+        auto_scale(10)
       end
     end
 
@@ -265,11 +258,11 @@ module Cron
       # Make sure we don't remove any workers with assigned jobs by accident
       return if desired_count.positive? && desired_count <= current_desired_capacity
 
-      client.update_auto_scaling_group(auto_scaling_group_name: sys_config.aws_auto_scaling_group_name,
-                                       min_size: desired_count,
-                                       desired_capacity: desired_count)
+      ecs_client.update_service(cluster: sys_config.aws_ecs_cluster_worker_name,
+                                service: sys_config.aws_ecs_service_worker_name,
+                                desired_count: desired_count)
     rescue StandardError => error
-      App47Logger.log_error "Unable to set auto scaler to #{desired_count}", error
+      App47Logger.log_error "Unable to set ECS service auto scaler to #{desired_count}", error
     end
 
     #
@@ -299,5 +292,11 @@ module Cron
     def ensure_last_check_in
       self.last_check_in_at ||= Time.now.utc
     end
+
+    # @abstract Returns the AWS ECS client
+    # @return [Aws::ECS::Client]
+    def ecs_client
+      @ecs_client ||= sys_config.aws_ecs_client
+    end
   end
 end

data/lib/app/models/concerns/aws_configuration.rb

@@ -14,8 +14,9 @@ module AwsConfiguration
       field :aws_region, type: String
       field :aws_access_key_id, type: String
       field :aws_secret_access_key, type: String
-      field :aws_auto_scaling_group_name, type: String
       field :aws_bucket_name, type: String
+      field :aws_ecs_cluster_worker_name, type: String
+      field :aws_ecs_service_worker_name, type: String
     end
   end
 
@@ -37,12 +38,11 @@ module AwsConfiguration
   # Determine if auto scaling group is configured
   #
   def aws_auto_scaling_configured?
-    aws_configured? && aws_auto_scaling_group_name.present?
+    aws_configured? && aws_ecs_cluster_worker_name.present? && aws_ecs_service_worker_name.present?
   end
 
-  #
-  # AWS client.
-  #
+  # @abstract EC2 Client
+  # @return [Aws::EC2::Client]
   def aws_ec2_client
     return nil unless aws_configured?
 
@@ -51,16 +51,33 @@ module AwsConfiguration
                                                                                aws_secret_access_key))
   end
 
-  #
-  # S3 Client
-  #
+  # @abstract S3 Client
+  # @return [Aws::S3::Client]
   def aws_s3_client
     return nil unless aws_configured?
 
-    # We want this to remake itself each time because it is possible that the
-    # => user would change the access keys in between actions. Huh?
     @aws_s3_client ||= Aws::S3::Client.new(region: aws_region,
                                            access_key_id: aws_access_key_id,
                                            secret_access_key: aws_secret_access_key)
   end
+
+  # @abstract ECS Client
+  # @return [Aws::ECS::Client]
+  def aws_ecs_client
+    return nil unless aws_configured?
+
+    @aws_s3_client ||= Aws::ECS::Client.new(region: aws_region,
+                                            access_key_id: aws_access_key_id,
+                                            secret_access_key: aws_secret_access_key)
+  end
+
+  # @abstract AutoScaling Client
+  # @return [Aws::AutoScaling::Client]
+  def aws_auto_scale_client
+    return nil unless aws_configured?
+
+    @auto_scale_client ||= Aws::AutoScaling::Client.new(access_key_id: aws_access_key_id,
+                                                        secret_access_key: aws_secret_access_key,
+                                                        region: aws_region)
+  end
 end

data/lib/web47core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.1
+  version: 3.2.3.2
 platform: ruby
 authors:
 - Chris Schroeder
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-autoscaling
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ecs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement