cloudtasker 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3cee90fe26e9033c26c27587088d54e7f85b36ef140aba67dc8101a62d4e84
-  data.tar.gz: b45465ca894e1d08066be61e27d88ab416ddd97fa43e5f66e54f13c46c552fca
+  metadata.gz: 2fa7ae9744ddccc745bae1202b99e3891f9ba1035fe26eec3663cfa705ae22e1
+  data.tar.gz: 92d090b796b74c09803ccb4e7cf9468f230b9aeb5df51eb8c630b677988a49b4
 SHA512:
-  metadata.gz: 9fa0e12e261db01f22bc3f7402b54d25e077b2297e74ccf838cdb0e856bb1ab318c1496651435d6354ce5cd0475af667f0a5a05f0265c0bd35a3101d3d9b21c5
-  data.tar.gz: 8313cb19a743b8d6dd651e5d1e6ef7f733ac453537e01623371360d0003a3f86536f6053a249e1b832e055596b34b8b8423d505770d289305c3b4c57971b0c6e
+  metadata.gz: 7284aa0d993977e53c40d9ecdcc05cca8a0448a32f1189a5f50e38afc538581eac491c47443f0b9c39c0bd0288ce5d6693da0ae07efb8eee93a447276da6e656
+  data.tar.gz: 256a041b899f4a4b1e52f8d5ded83fc4bc370fd7ead98873658f60e107d60cf45c7817d019f13565d4cbd8bb2a0b58ce0a78db2aaaf7de023a37c299103c6a0b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudtasker (0.4.0)
+    cloudtasker (0.5.0)
       activesupport
       fugit
       google-cloud-tasks

data/lib/cloudtasker/batch/job.rb

@@ -7,7 +7,8 @@ module Cloudtasker
       attr_reader :worker
 
       # Key Namespace used for object saved under this class
-      SUB_NAMESPACE = 'job'
+      JOBS_NAMESPACE = 'jobs'
+      STATES_NAMESPACE = 'states'
 
       # List of statuses triggering a completion callback
       COMPLETION_STATUSES = %w[completed dead].freeze
@@ -32,7 +33,7 @@ module Cloudtasker
         return nil unless worker_id
 
         # Retrieve related worker
-        payload = redis.fetch(key(worker_id))
+        payload = redis.fetch(key("#{JOBS_NAMESPACE}/#{worker_id}"))
         worker = Cloudtasker::Worker.from_hash(payload)
         return nil unless worker
 
@@ -140,7 +141,7 @@ module Cloudtasker
       # @return [String] The worker namespaced id.
       #
       def batch_gid
-        key(batch_id)
+        key("#{JOBS_NAMESPACE}/#{batch_id}")
       end
 
       #
@@ -149,7 +150,7 @@ module Cloudtasker
       # @return [String] The batch state namespaced id.
       #
       def batch_state_gid
-        [batch_gid, 'state'].join('/')
+        key("#{STATES_NAMESPACE}/#{batch_id}")
       end
 
       #
@@ -371,7 +372,7 @@ module Cloudtasker
         setup
 
         # Complete batch
-        complete(:success)
+        complete(:completed)
       rescue DeadWorkerError => e
         complete(:dead)
         raise(e)

data/lib/cloudtasker/cron/schedule.rb

@@ -72,8 +72,10 @@ module Cloudtasker
       # @return [Cloudtasker::Cron::Schedule] The schedule instance.
       #
       def self.create(**opts)
-        config = find(opts[:id]).to_h.merge(opts)
-        new(config).tap(&:save)
+        redis.with_lock(key(opts[:id])) do
+          config = find(opts[:id]).to_h.merge(opts)
+          new(config).tap(&:save)
+        end
       end
 
       #
@@ -95,12 +97,14 @@ module Cloudtasker
       # @param [String] id The schedule id.
       #
       def self.delete(id)
-        schedule = find(id)
-        return false unless schedule
+        redis.with_lock(key(id)) do
+          schedule = find(id)
+          return false unless schedule
 
-        # Delete task and stored schedule
-        CloudTask.delete(schedule.task_id) if schedule.task_id
-        redis.del(schedule.gid)
+          # Delete task and stored schedule
+          CloudTask.delete(schedule.task_id) if schedule.task_id
+          redis.del(schedule.gid)
+        end
       end
 
       #

data/lib/cloudtasker/redis_client.rb

@@ -8,7 +8,7 @@ module Cloudtasker
     module_function
 
     # Suffix added to cache keys when locking them
-    LOCK_KEY_SUFFIX = 'lock'
+    LOCK_KEY_PREFIX = 'cloudtasker/lock'
 
     #
     # Return the underlying redis client.
@@ -61,7 +61,7 @@ module Cloudtasker
       return nil unless cache_key
 
       # Wait to acquire lock
-      lock_key = [cache_key, LOCK_KEY_SUFFIX].join('/')
+      lock_key = [LOCK_KEY_PREFIX, cache_key].join('/')
       true until client.setnx(lock_key, true)
 
       # yield content

data/lib/cloudtasker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudtasker
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudtasker
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Arnaud Lachaume