cloudtasker 0.10.rc5 → 0.10.1

data/lib/cloudtasker/unique_job/middleware/client.rb

@@ -5,7 +5,7 @@ module Cloudtasker
     module Middleware
       # Client middleware, invoked when jobs are scheduled
       class Client
-        def call(worker)
+        def call(worker, **_kwargs)
           Job.new(worker).lock_instance.schedule { yield }
         end
       end

data/lib/cloudtasker/unique_job/middleware/server.rb

@@ -5,7 +5,7 @@ module Cloudtasker
     module Middleware
       # Server middleware, invoked when jobs are executed
       class Server
-        def call(worker)
+        def call(worker, **_kwargs)
           Job.new(worker).lock_instance.execute { yield }
         end
       end

data/lib/cloudtasker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudtasker
-  VERSION = '0.10.rc5'
+  VERSION = '0.10.1'
 end

data/lib/cloudtasker/worker.rb

@@ -8,7 +8,7 @@ module Cloudtasker
       base.extend(ClassMethods)
       base.attr_writer :job_queue
       base.attr_accessor :job_args, :job_id, :job_meta, :job_reenqueued, :job_retries,
-                         :perform_started_at, :perform_ended_at
+                         :perform_started_at, :perform_ended_at, :task_id
     end
 
     #
@@ -47,7 +47,7 @@ module Cloudtasker
       return nil unless worker_klass.include?(self)
 
       # Return instantiated worker
-      worker_klass.new(payload.slice(:job_queue, :job_args, :job_id, :job_meta, :job_retries))
+      worker_klass.new(payload.slice(:job_queue, :job_args, :job_id, :job_meta, :job_retries, :task_id))
     rescue NameError
       nil
     end
@@ -140,12 +140,13 @@ module Cloudtasker
     # @param [Array<any>] job_args The list of perform args.
     # @param [String] job_id A unique ID identifying this job.
     #
-    def initialize(job_queue: nil, job_args: nil, job_id: nil, job_meta: {}, job_retries: 0)
+    def initialize(job_queue: nil, job_args: nil, job_id: nil, job_meta: {}, job_retries: 0, task_id: nil)
       @job_args = job_args || []
       @job_id = job_id || SecureRandom.uuid
       @job_meta = MetaStore.new(job_meta)
       @job_retries = job_retries || 0
       @job_queue = job_queue
+      @task_id = task_id
     end
 
     #
@@ -197,18 +198,36 @@ module Cloudtasker
       raise(e)
     end
 
+    #
+    # Return a unix timestamp specifying when to run the task.
+    #
+    # @param [Integer, nil] interval The time to wait.
+    # @param [Integer, nil] time_at The time at which the job should run.
+    #
+    # @return [Integer, nil] The Unix timestamp.
+    #
+    def schedule_time(interval: nil, time_at: nil)
+      return nil unless interval || time_at
+
+      # Generate the complete Unix timestamp
+      (time_at || Time.now).to_i + interval.to_i
+    end
+
     #
     # Enqueue a worker, with or without delay.
     #
     # @param [Integer] interval The delay in seconds.
-    #
     # @param [Time, Integer] interval The time at which the job should run
     #
     # @return [Cloudtasker::CloudTask] The Google Task response
     #
-    def schedule(interval: nil, time_at: nil)
-      Cloudtasker.config.client_middleware.invoke(self) do
-        WorkerHandler.new(self).schedule(interval: interval, time_at: time_at)
+    def schedule(**args)
+      # Evaluate when to schedule the job
+      time_at = schedule_time(args)
+
+      # Schedule job through client middlewares
+      Cloudtasker.config.client_middleware.invoke(self, time_at: time_at) do
+        WorkerHandler.new(self).schedule(time_at: time_at)
       end
     end
 
@@ -250,7 +269,8 @@ module Cloudtasker
         job_args: job_args,
         job_meta: job_meta.to_h,
         job_retries: job_retries,
-        job_queue: job_queue
+        job_queue: job_queue,
+        task_id: task_id
       }
     end
 
@@ -276,6 +296,20 @@ module Cloudtasker
       other.is_a?(self.class) && other.job_id == job_id
     end
 
+    #
+    # Return the max number of retries allowed for this job.
+    #
+    # The order of precedence for retry lookup is:
+    # - Worker `max_retries` method
+    # - Class `max_retries` option
+    # - Cloudtasker `max_retries` config option
+    #
+    # @return [Integer] The number of retries
+    #
+    def job_max_retries
+      @job_max_retries ||= (try(:max_retries, *job_args) || self.class.max_retries)
+    end
+
     #
     # Return true if the job has excceeded its maximum number
     # of retries
@@ -283,7 +317,7 @@ module Cloudtasker
     # @return [Boolean] True if the job is dead
     #
     def job_dead?
-      job_retries >= Cloudtasker.config.max_retries
+      job_retries >= job_max_retries
     end
 
     #

data/lib/cloudtasker/worker_handler.rb

@@ -56,11 +56,6 @@ module Cloudtasker
       with_worker_handling(input_payload, &:execute)
     end
 
-    # TODO: do not delete redis payload if job has been re-enqueued
-    # worker.job_reenqueued
-    #
-    # Idea: change with_worker_handling to with_worker_handling and build the worker
-    # inside the with_worker_handling block.
     #
     # Local middleware used to retrieve the job arg payload from cache
     # if a arg payload reference is present.
@@ -210,35 +205,17 @@ module Cloudtasker
       }.merge(worker_args_payload)
     end
 
-    #
-    # Return a protobuf timestamp specifying how to wait
-    # before running a task.
-    #
-    # @param [Integer, nil] interval The time to wait.
-    # @param [Integer, nil] time_at The time at which the job should run.
-    #
-    # @return [Integer, nil] The Unix timestamp.
-    #
-    def schedule_time(interval: nil, time_at: nil)
-      return nil unless interval || time_at
-
-      # Generate the complete Unix timestamp
-      (time_at || Time.now).to_i + interval.to_i
-    end
-
     #
     # Schedule the task on GCP Cloud Task.
     #
-    # @param [Integer, nil] interval How to wait before running the task.
+    # @param [Integer, nil] time_at A unix timestamp specifying when to run the job.
     #   Leave to `nil` to run now.
     #
     # @return [Cloudtasker::CloudTask] The Google Task response
     #
-    def schedule(interval: nil, time_at: nil)
+    def schedule(time_at: nil)
       # Generate task payload
-      task = task_payload.merge(
-        schedule_time: schedule_time(interval: interval, time_at: time_at)
-      ).compact
+      task = task_payload.merge(schedule_time: time_at).compact
 
       # Create and return remote task
       CloudTask.create(task)

data/lib/cloudtasker/worker_logger.rb

@@ -11,7 +11,7 @@ module Cloudtasker
     end
 
     # Only log the job meta information by default (exclude arguments)
-    DEFAULT_CONTEXT_PROCESSOR = ->(worker) { worker.to_h.slice(:worker, :job_id, :job_meta, :job_queue) }
+    DEFAULT_CONTEXT_PROCESSOR = ->(worker) { worker.to_h.slice(:worker, :job_id, :job_meta, :job_queue, :task_id) }
 
     #
     # Build a new instance of the class.
@@ -142,7 +142,7 @@ module Cloudtasker
     #
     def log_message(level, msg, &block)
       # Merge log-specific context into worker-specific context
-      payload_block = -> { log_block.call.merge(block&.call || {}) }
+      payload_block = ->(*_args) { log_block.call.merge(block&.call || {}) }
 
       # ActiveSupport::Logger does not support passing a payload through a block on top
       # of a message.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudtasker
 version: !ruby/object:Gem::Version
-  version: 0.10.rc5
+  version: 0.10.1
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: google-cloud-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: retriable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -192,6 +206,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.37.0
+- !ruby/object:Gem::Dependency
+  name: semantic_logger
+  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: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -310,6 +338,11 @@ files:
 - gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.0.gemfile.lock
+- gemfiles/semantic_logger_3.4.gemfile
+- gemfiles/semantic_logger_4.6.gemfile
+- gemfiles/semantic_logger_4.7.0.gemfile
+- gemfiles/semantic_logger_4.7.2.gemfile
+- gemfiles/semantic_logger_4.7.gemfile
 - lib/cloudtasker.rb
 - lib/cloudtasker/authentication_error.rb
 - lib/cloudtasker/authenticator.rb
@@ -378,9 +411,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.0
 signing_key: