boxxspring-workers 1.2.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9bb58d38eac80a419803140a16f795f1d2295c0a
-  data.tar.gz: '04797acf3a9e42b0c16c1646fab97f754026658e'
+SHA256:
+  metadata.gz: 592a7fe1d26ded3ac57107334b47832a35a0085ec11638a10b6ada575196c4d4
+  data.tar.gz: c375eb299997a3aa01cbe14e2ef92ebb2cbb171ab1082ffa7d380d49ff581e0b
 SHA512:
-  metadata.gz: 4273c1fecb32544463181a2e49bdc9b2c2ce81c03a28776de56b8fd1b7548ba6c5bd88186056e31111a733ac9a4e9055bbeae75b5d45465442f53badf116a92f
-  data.tar.gz: 9f50f6eb3002870ef1e4268d07f7f010ca0b95d4af253d6b864c260ad3883817b4b9908164c6647fa5d47fb6a10d7f3b1dec7c47bf032710b8656a7fb6a49fe4
+  metadata.gz: 4bd1cbbae7404c01a92913160b0c9667c38cccc78177da023f242f88e8ae12614f40ecd22e80d099a158091c7de56fc13ad0e90fcedc2cb00df3a671e33fcab5
+  data.tar.gz: c219d6f34bf58a994b3ad9fe4c59c71b63a90ef0238fe2af8f4bbd42909fec5a966474d0dc9d2b28014e67c4e0b3e3c561f90a3b61eacc275ef56c4c32882550

data/lib/boxxspring-worker-version.rb

@@ -1,5 +1,5 @@
 module Boxxspring
   module Worker
-    VERSION = '1.2.0'
+    VERSION = '1.5.2'
   end
 end

data/lib/boxxspring-worker.rb

@@ -7,12 +7,14 @@ require 'lib/boxxspring/journal'
 require 'lib/boxxspring/worker'
 require 'lib/boxxspring/worker/logging'
 require 'lib/boxxspring/worker/metrics'
+require 'lib/boxxspring/worker/error'
 require 'lib/boxxspring/worker/metrics/metric_computer'
 require 'lib/boxxspring/worker/metrics/microseconds_metric_computer'
 require 'lib/boxxspring/worker/metrics/count_metric_computer'
 require 'lib/boxxspring/worker/metrics/seconds_metric_computer'
 require 'lib/boxxspring/worker/metrics/milliseconds_metric_computer'
 require 'lib/boxxspring/worker/configuration'
+require 'lib/boxxspring/worker/authorization'
 require 'lib/boxxspring/worker/base'
 require 'lib/boxxspring/worker/task_base'
 require 'lib/boxxspring/synchronization/configuration'

data/lib/boxxspring/worker/authorization.rb

@@ -0,0 +1,49 @@
+module Boxxspring
+
+  module Worker
+
+     module Authorization
+
+        def authorize( &block )
+          begin
+            retries ||= 3
+            block.call( token )
+          rescue Unimatrix::AuthorizationError => exception
+            if ( retries -= 1 ) > 0
+              token!
+              retry
+            else
+              raise exception
+            end
+          end
+        end
+
+        def authorize_operation( result = nil, error_message = nil )
+          result = yield if block_given?
+
+          if result.is_a?( Array ) && result.first.is_a?( Unimatrix::ForbiddenError )
+            raise Unimatrix::AuthorizationError, error_message
+          end
+
+          result
+        end
+
+        protected; def token
+          @authorization_token ||= begin
+             Unimatrix::Authorization::ClientCredentialsGrant.new(
+               client_id:     ENV[ 'KEYMAKER_CLIENT' ],
+               client_secret: ENV[ 'KEYMAKER_SECRET' ]
+             ).request_token
+          end
+        end
+
+        protected; def token!
+          @authorization_token = nil
+          token
+        end
+
+    end
+
+  end
+
+end

data/lib/boxxspring/worker/base.rb

@@ -12,6 +12,7 @@ module Boxxspring
 
       include Logging
       include Metrics
+      include Authorization
 
       #------------------------------------------------------------------------
       # class attributes
@@ -54,7 +55,9 @@ module Boxxspring
           queue_name = self.queue_name ||
                        self.name.underscore.gsub( /[\/]/, '-' ).
                          gsub( /_worker\Z/, '' )
-          self.environment + '-' + queue_name
+          full_name = self.environment + '-' + queue_name
+          
+          ENV[ 'PRIORITY' ] ? ( full_name + '_priority' ) : full_name
         end
 
       end
@@ -63,8 +66,8 @@ module Boxxspring
       # operations
 
       def process
-         metric_defaults  dimensions: { worker_name: self.class.name, 
-                                        environment: environment } do 
+         metric_defaults  dimensions: { worker_name: self.class.name,
+                                        environment: environment } do
 
           messages = self.receive_messages() || []
           messages.each do | message |
@@ -73,14 +76,14 @@ module Boxxspring
 
               if payload.present?
                 begin
-                  metric :messages do 
+                  metric :messages do
                     result = self.process_payload( payload )
-                    
+
                     # note: if an exception is raised the message will be deleted
                     self.delete_message( message ) unless result == false
                   end
                 rescue StandardError => error
-                  metric :errors 
+                  metric :errors
 
                   self.logger.error(
                     "The #{ self.human_name } failed to process the payload."
@@ -138,7 +141,7 @@ module Boxxspring
       end
 
       protected; def payload_from_message( message )
-        
+
         payload = message.body
 
         if payload.present?
@@ -151,7 +154,7 @@ module Boxxspring
               payload
           end
         else
-          logger.error( "The message lacks a payload." ) 
+          logger.error( "The message lacks a payload." )
           logger.debug( message.inspect )
         end
         payload

data/lib/boxxspring/worker/error.rb

@@ -0,0 +1,9 @@
+module Boxxspring
+  module Worker
+    
+    class Error < Unimatrix::Error
+      field :message
+    end
+    
+  end
+end

data/lib/boxxspring/worker/logging.rb

@@ -38,7 +38,8 @@ module Boxxspring
                   secret_access_key: ENV[ 'AWS_SECRET_ACCESS_KEY' ]
                 },
                 group_name,
-                worker_name
+                worker_name,
+                region: ENV[ 'AWS_REGION' ]
               )
 
             end
@@ -77,7 +78,7 @@ module Boxxspring
         log_local = ENV[ 'LOG_LOCAL' ] || 'false'
         ( log_local.to_s =~ /^true$/i ) == 0
       end
-    
+
     end
   end
 end

data/lib/boxxspring/worker/metrics.rb

@@ -1,15 +1,15 @@
 require 'thread'
 
 module Boxxspring
-  
+
   module Worker
-  
+
     module Metrics
-      
-      METRICS_MUTEX = Mutex.new 
-      METRICS_CLIENT = Aws::CloudWatch::Client.new 
-      METRICS_UPLOAD_INTERVAL = 1
-      
+
+      METRICS_MUTEX = Mutex.new
+      METRICS_CLIENT = Aws::CloudWatch::Client.new
+      METRICS_UPLOAD_INTERVAL = 0.5
+
       def initialize( *arguments )
         super
 
@@ -22,35 +22,40 @@ module Boxxspring
       end
 
       def upload_metrics
-        loop do 
+        loop do
           unless @metrics.empty?
             begin
-              metrics_payload = nil 
-              
+              metrics_payload = nil
+
               METRICS_MUTEX.synchronize do
-                metrics_payload = @metrics
-                @metrics = []
+                if @metrics.count > 20
+                  logger.info( "Metrics queue has #{ @metrics.count } metrics" )
+                end
+
+                metrics_payload = @metrics.shift(20)
               end
-              
+
               METRICS_CLIENT.put_metric_data( {
                 namespace: 'Unimatrix/Worker',
                 metric_data: metrics_payload
               } )
 
-            rescue Error => e
-              logger.error( 
+            rescue => error
+              logger.error(
                 "An error has occured when making a request to the AWS " +
-                "Cloudwatch endpoint 'put_metric_data'." 
+                "Cloudwatch endpoint 'put_metric_data'. - Error message: " +
+                "#{ error.message }"
               )
             end
 
-            sleep METRICS_UPLOAD_INTERVAL 
           end
+
+          sleep METRICS_UPLOAD_INTERVAL
         end
       end
 
       def metric_defaults( defaults = {} )
-        previous_defaults = @metric_defaults.last 
+        previous_defaults = @metric_defaults.last
         @metric_defaults.push( previous_defaults.merge( defaults ) )
 
         yield
@@ -61,7 +66,7 @@ module Boxxspring
       def metric ( *arguments )
         arguments = [ arguments ] unless arguments.first.is_a? Array
         computers = arguments.map do | metric |
-          parsed_metric = parse_metric( metric )  
+          parsed_metric = parse_metric( metric )
 
           computer_class =
             "#{ parsed_metric[ :unit ].to_s.capitalize }MetricComputer".constantize
@@ -75,10 +80,10 @@ module Boxxspring
         end
 
         METRICS_MUTEX.synchronize do
-          @metrics = @metrics.concat( 
-            computers.map( &:to_json ).delete_if { | json | json.blank? } 
-          ) 
-        end 
+          @metrics = @metrics.concat(
+            computers.map( &:to_json ).delete_if { | json | json.blank? }
+          )
+        end
 
       end
 

data/lib/boxxspring/worker/task_base.rb

@@ -14,10 +14,10 @@ module Boxxspring
       # operations
 
       protected; def process_task( task )
-        if self.class.processor.present? 
+        if self.class.processor.present?
           self.class.processor.call( task )
         else
-          raise RuntimeError.new( 
+          raise RuntimeError.new(
             "The #{ self.human_name } lacks a task processor"
           )
         end
@@ -28,50 +28,46 @@ module Boxxspring
 
       protected; def process_payload( payload )
         result = true
-        type_names = self.task_type_name.blank? ? 
-                       nil : [ self.task_type_name ].flatten
-        states = self.task_state.blank? ?
-                   nil : [ self.task_state ].flatten
-        tasks = payload[ 'tasks' ]
-
-        if tasks.present? && tasks.respond_to?( :each )
-          tasks.each do | task |
-            task_id = task[ 'id' ]
-            if type_names.blank? || type_names.include?( task[ 'type_name' ] )
-              task = task_read( task[ 'property_id' ], task_id )
-
-              if task.is_a?( Boxxspring::Task )
-                if states.blank? || states.include?( task.state )
-                  self.logger.info(  
-                    "Task #{ task.id } processing has started."
-                  )
-                  begin
-                    result = self.process_task( task )
-                    message = "Task #{ task.id } processing has ended"
-                    message += " and the message was retained." if result == false
-                    self.logger.info( message )
-                  rescue SignalException, StandardError => error
-                    if error.is_a?( SignalException )
-                      task_state = 'idle'
-                      task_message = "Task #{ task.id } has restarted."
-                    else
-                      task_state = 'failed'
-                      task_message = "Task #{ task.id } processing has failed."
-                    end
-                    task = task_write_state( task, task_state, task_message )
-                    self.logger.error( error.message )
-                    self.logger.info( error.backtrace.join( "\n" ) )
-                    raise error if error.is_a?( SignalException )
-                  end
+        task = payload[ 'tasks' ].first
+
+        task_type_name = self.human_name.split( " " )
+        task_type_name.pop
+        task_type_name = task_type_name.join( "_" ) + "_task"
+
+        if task.present?
+          task_uuid = task[ 'uuid' ]
+          if task_type_name == payload[ '$this' ][ 'type_name' ]
+            task = Unimatrix::Activist::Task.new( task )
+
+            if task.is_a?( Unimatrix::Activist::Task )
+              self.logger.info(
+                "Task #{ task.uuid } processing has started."
+              )
+              begin
+                result = self.process_task( task )
+                message = "Task #{ task.uuid } processing has ended"
+                message += " and the message was retained." if result == false
+                self.logger.info( message )
+              rescue SignalException, StandardError => error
+                if error.is_a?( SignalException )
+                  task_state = 'idle'
+                  task_message = "Task #{ task.uuid } has restarted."
+                else
+                  task_state = 'failed'
+                  task_message = "Task #{ task.uuid } processing has failed."
                 end
-              elsif task.is_a?( Array ) && task.first.respond_to?( :message )
-                self.logger.error( task.first.message )
-              else
-                self.logger.error(
-                  "The #{self.human_name} is unable to retrieve the " +
-                  "task with the id #{task_id}. #{task.inspect}"
-                )
+                task = task_write_state( task, task_state, task_message )
+                self.logger.error( error.message )
+                self.logger.info( error.backtrace.join( "\n" ) )
+                raise error if error.is_a?( SignalException )
               end
+            elsif task.is_a?( Array ) && task.first.respond_to?( :message )
+              self.logger.error( task.first.message )
+            else
+              self.logger.error(
+                "The #{self.human_name} is unable to retrieve the " +
+                "task with the id #{task.uuid}. #{task.inspect}"
+              )
             end
           end
         end
@@ -79,17 +75,19 @@ module Boxxspring
         result
       end
 
-      protected; def task_read( property_id, task_id )
-        # why did this not work?
-        # self.task_operation( property_id ).where( id: task_id ).read
-        Boxxspring::Operation.new( 
-          "/properties/#{ property_id }/tasks/#{ task_id }",
-          Worker.configuration.api_credentials.to_hash
-        ).read      
+      protected; def task_read( task )
+        authorize_operation do
+          self.unimatrix_operation(
+            "/realms/#{ task.realm_uuid }/tasks/#{ task.uuid }"
+          ).read
+        end
       end
 
       protected; def task_write( task )
-        self.task_operation( task.property_id ).write( 'tasks', task ).first
+        authorize_operation do
+          self.unimatrix_operation( "/realms/#{ task.realm_uuid }/tasks" ).
+            write( 'tasks', task )
+        end
       end
 
       protected; def task_write_state( task, state, message )
@@ -100,37 +98,13 @@ module Boxxspring
         self.task_write( task )
       end
 
-      protected; def task_operation( property_id )
-        Boxxspring::Operation.new( 
-          "/properties/#{ property_id }/tasks",
-          Worker.configuration.api_credentials.to_hash
-        )
-      end
-
-      protected; def task_property_read( task, include = nil )
-        operation = Boxxspring::Operation.new( 
-          "/properties/#{ task.property_id }", 
-          Worker.configuration.api_credentials.to_hash
+      protected; def unimatrix_operation( endpoint, args = {} )
+        Unimatrix::Operation.new(
+          endpoint,
+          args.merge( { access_token: token } )
         )
-        operation = operation.include( include ) \
-          unless ( include.blank? ) 
-        operation.read
-      end
-
-      protected; def task_delegate( queue_name, task )
-        serializer = Boxxspring::Serializer.new( task )
-        payload = serializer.serialize( 'tasks' )
-        payload.merge!( { 
-          '$this' => { 
-            'type_name' => 'tasks', 
-            'unlimited_count' => 1
-          }
-        } )
-        self.delegate_payload( queue_name, payload )
       end
 
     end
-
   end
-
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: boxxspring-workers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Kristoph Cichocki-Romanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: unimatrix
+  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: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -126,8 +140,10 @@ files:
 - lib/boxxspring/synchronization/orchestrator.rb
 - lib/boxxspring/synchronization/variable.rb
 - lib/boxxspring/worker.rb
+- lib/boxxspring/worker/authorization.rb
 - lib/boxxspring/worker/base.rb
 - lib/boxxspring/worker/configuration.rb
+- lib/boxxspring/worker/error.rb
 - lib/boxxspring/worker/logging.rb
 - lib/boxxspring/worker/metrics.rb
 - lib/boxxspring/worker/metrics/count_metric_computer.rb
@@ -157,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Bedrocket Media Ventrures Boxxspring Worker framework.