funktor 0.7.5 → 0.7.8

data/lib/funktor/work_queue_handler.rb

@@ -20,23 +20,28 @@ module Funktor
     end
 
     def dynamodb_client
-      @dynamodb_client ||= ::Aws::DynamoDB::Client.new
+      Funktor.dynamodb_client
     end
 
     def sqs_client
-      @sqs_client ||= ::Aws::SQS::Client.new
+      Funktor.sqs_client
     end
 
     def dispatch(job)
       begin
         @tracker.track(:processingStarted, job)
-        update_job_category(job, "processing")
+        if Funktor.enable_work_queue_visibility
+          update_job_category(job, "processing")
+        end
         Funktor.work_queue_handler_middleware.invoke(job) do
           job.execute
         end
         @processed_counter.incr(job)
         @tracker.track(:processingComplete, job)
-        delete_job_from_dynamodb(job)
+
+        if Funktor.enable_work_queue_visibility
+          delete_job_from_dynamodb(job)
+        end
       # rescue Funktor::Job::InvalidJsonError # TODO Make this work
       rescue Exception => e
         handle_error(e, job)
@@ -44,11 +49,17 @@ module Funktor
         job.error = e
         if job.can_retry
           @tracker.track(:retrying, job)
-          update_job_category(job, "retry")
+
+          if Funktor.enable_work_queue_visibility
+            update_job_category(job, "retry")
+          end
           trigger_retry(job)
         else
           @tracker.track(:bailingOut, job)
-          update_job_category(job, "dead")
+
+          if Funktor.enable_work_queue_visibility
+            update_job_category(job, "dead")
+          end
           Funktor.logger.error "We retried max times. We're bailing on this one."
           Funktor.logger.error job.to_json
         end
@@ -71,6 +82,7 @@ module Funktor
     end
 
     def update_job_category(job, category)
+      puts "starting update_job_category #{category}"
       dynamodb_client.update_item({
         key: {
           "jobShard" => job.shard,
@@ -84,9 +96,11 @@ module Funktor
         },
         return_values: "ALL_OLD"
       })
+      puts "ending update_job_category #{category}"
     end
 
     def delete_job_from_dynamodb(job)
+      puts "starting delete_job_from_dynamodb"
       dynamodb_client.delete_item({
         key: {
           "jobShard" => job.shard,
@@ -95,6 +109,7 @@ module Funktor
         table_name: delayed_job_table,
         return_values: "ALL_OLD"
       })
+      puts "ending delete_job_from_dynamodb"
     end
 
   end

data/lib/funktor.rb

@@ -12,13 +12,16 @@ require_relative 'funktor/job_activator'
 require_relative 'funktor/activity_tracker'
 
 require 'json'
+require 'aws-sdk-dynamodb'
+require 'aws-sdk-sqs'
 
 module Funktor
   class Error < StandardError; end
 
   DEFAULT_OPTIONS = {
     error_handlers: [],
-    log_level: Logger::DEBUG # Set a high log level during early, active development
+    log_level: Logger::DEBUG, # Set a high log level during early, active development
+    enable_work_queue_visibility: true # Enable this by default during early, active development
   }
 
   def self.configure_job_pusher
@@ -110,6 +113,14 @@ module Funktor
     @logger = logger
   end
 
+  def self.enable_work_queue_visibility
+    options[:enable_work_queue_visibility]
+  end
+
+  def self.enable_work_queue_visibility= enabled
+    options[:enable_work_queue_visibility] = enabled
+  end
+
   # We have a raw_logger that doesn't add timestamps and what not. This is used to publish
   # CloudWatch metrics that can be used in dashboards.
   def self.raw_logger
@@ -126,6 +137,14 @@ module Funktor
 
     @raw_logger = raw_logger
   end
+
+  def self.dynamodb_client
+    @dynamodb_client ||= ::Aws::DynamoDB::Client.new
+  end
+
+  def self.sqs_client
+    @sqs_client ||= ::Aws::SQS::Client.new
+  end
 end
 
 # TODO - Is it a code smell that we need to include these at the bottom, after

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.8
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -176,6 +176,7 @@ files:
 - exe/funktor-deploy
 - funktor-testapp/.envrc
 - funktor-testapp/.gitignore
+- funktor-testapp/Dockerfile
 - funktor-testapp/Gemfile
 - funktor-testapp/Gemfile.lock
 - funktor-testapp/app/services/job_flood.rb
@@ -227,6 +228,7 @@ files:
 - lib/funktor/cli/generate/base.rb
 - lib/funktor/cli/generate/work_queue.rb
 - lib/funktor/cli/init.rb
+- lib/funktor/cli/templates/Dockerfile
 - lib/funktor/cli/templates/Gemfile
 - lib/funktor/cli/templates/app/workers/hello_worker.rb
 - lib/funktor/cli/templates/funktor_config/boot.rb