canvas_sync 0.19.0.beta3 → 0.19.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d6b617272cdcd0d707dcf732e93b537aba165054ea8c3c2ddf9eb85f141b75b
-  data.tar.gz: 836afc2cca6c11d8917188c7cb68853c23455a450c983a738f4c21c7382e5280
+  metadata.gz: 9aab48735770121e4d641be35d384cd23d80a70ac63843abdf8b294bac6337ef
+  data.tar.gz: 1cc71d419bbcec4aa07b776ccd3d57a0cc895e4742396cd0d7bc12e0b8692f1d
 SHA512:
-  metadata.gz: b33944c8079dc4315c71afe6998c79e83d12fa476223c81a943a75025e0faca50e4cde96a68a195d90cb66d674303666992a9f75de840ee00e0bce3beba75ba7
-  data.tar.gz: 931b2cc7992a8069c152cf3651544a6600603a45bb25baa3a8679011fd0c809726054d203da41cf558aa685f88e31b152f78ee78c535e40c2f487c4d0fa65746
+  metadata.gz: 62846f6d0f2ee0ec5dafbe7d814913addf42c23818693aa68687f60ecc70e2c13e712b8e1d5c352c7b80842f5d9e9a9233d8206a0d750e507e9aef8075b560ba
+  data.tar.gz: dbf8f8aaa94a13d3457790dd1339de9b615cf1d00916ca8c2767950f47aaef136cd9986992866cd46d836d70c77240cf9f144970a453f93d408a147aefad1433

data/lib/canvas_sync/job_batches/pool.rb

@@ -107,6 +107,10 @@ module CanvasSync
         r.hlen("#{redis_key}-active") + r.hincrby(redis_key, "_active_count", 0)
       end
 
+      def active_jobs(r = redis)
+        r.hvals("#{redis_key}-active").map {|desc| JSON.parse(desc) }
+      end
+
       def pending_count(r = redis)
         jobs_key = "#{redis_key}-jobs"
         order = self.order || 'fifo'

data/lib/canvas_sync/job_batches/sidekiq/web.rb

@@ -166,7 +166,7 @@ module CanvasSync::JobBatches::Sidekiq
         @pid = params[:pid]
         @pool = CanvasSync::JobBatches::Pool.new(@pid)
 
-        @active_tasks = @pool.redis.hvals("#{@pool.redis_key}-active").map {|desc, score=nil| JSON.parse(desc) }
+        @active_tasks = @pool.active_jobs
 
         @count = (params['count'] || 25).to_i
         @current_jobs_page, @total_jobs_size, @jobs = page("POOLID-#{@pool.pid}-jobs", params['job_page'], @count)

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.19.0.beta3".freeze
+  VERSION = "0.19.0.beta4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta3
+  version: 0.19.0.beta4
 platform: ruby
 authors:
 - Instructure CustomDev