canvas_sync 0.19.0.beta3 → 0.19.0.beta4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9aab48735770121e4d641be35d384cd23d80a70ac63843abdf8b294bac6337ef
|
|
4
|
+
data.tar.gz: 1cc71d419bbcec4aa07b776ccd3d57a0cc895e4742396cd0d7bc12e0b8692f1d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 62846f6d0f2ee0ec5dafbe7d814913addf42c23818693aa68687f60ecc70e2c13e712b8e1d5c352c7b80842f5d9e9a9233d8206a0d750e507e9aef8075b560ba
|
|
7
|
+
data.tar.gz: dbf8f8aaa94a13d3457790dd1339de9b615cf1d00916ca8c2767950f47aaef136cd9986992866cd46d836d70c77240cf9f144970a453f93d408a147aefad1433
|
|
@@ -107,6 +107,10 @@ module CanvasSync
|
|
|
107
107
|
r.hlen("#{redis_key}-active") + r.hincrby(redis_key, "_active_count", 0)
|
|
108
108
|
end
|
|
109
109
|
|
|
110
|
+
def active_jobs(r = redis)
|
|
111
|
+
r.hvals("#{redis_key}-active").map {|desc| JSON.parse(desc) }
|
|
112
|
+
end
|
|
113
|
+
|
|
110
114
|
def pending_count(r = redis)
|
|
111
115
|
jobs_key = "#{redis_key}-jobs"
|
|
112
116
|
order = self.order || 'fifo'
|
|
@@ -166,7 +166,7 @@ module CanvasSync::JobBatches::Sidekiq
|
|
|
166
166
|
@pid = params[:pid]
|
|
167
167
|
@pool = CanvasSync::JobBatches::Pool.new(@pid)
|
|
168
168
|
|
|
169
|
-
@active_tasks = @pool.
|
|
169
|
+
@active_tasks = @pool.active_jobs
|
|
170
170
|
|
|
171
171
|
@count = (params['count'] || 25).to_i
|
|
172
172
|
@current_jobs_page, @total_jobs_size, @jobs = page("POOLID-#{@pool.pid}-jobs", params['job_page'], @count)
|
data/lib/canvas_sync/version.rb
CHANGED