blaxter-delayed_job 2.1.4 → 2.1.5
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/delayed/job.rb +9 -2
- data/lib/delayed/job_launcher.rb +6 -0
- data/lib/delayed/worker.rb +1 -2
- metadata +4 -4
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.1.
|
1
|
+
2.1.5
|
data/lib/delayed/job.rb
CHANGED
@@ -95,15 +95,22 @@ module Delayed
|
|
95
95
|
sql << ' AND name LIKE ?'
|
96
96
|
conditions << "%#{options[:only_for]}%"
|
97
97
|
end
|
98
|
+
|
99
|
+
if options[:unless]
|
100
|
+
sql << " AND (#{primary_key} NOT IN (?))"
|
101
|
+
conditions << options[:unless]
|
102
|
+
end
|
103
|
+
|
98
104
|
conditions.unshift(sql)
|
99
105
|
end
|
100
106
|
|
101
107
|
# Find a few candidate jobs to run (in case some immediately get locked by others).
|
102
108
|
# Return in random order prevent everyone trying to do same head job at once.
|
103
109
|
def find_available(options = {})
|
104
|
-
|
110
|
+
find_opt = {:conditions => conditions_available(options), :order => NextTaskOrder}
|
111
|
+
find_opt[:limit] = options[:limit] if options[:limit]
|
105
112
|
ActiveRecord::Base.silence do
|
106
|
-
find :all,
|
113
|
+
find :all, find_opt
|
107
114
|
end
|
108
115
|
end
|
109
116
|
|
data/lib/delayed/job_launcher.rb
CHANGED
data/lib/delayed/worker.rb
CHANGED
@@ -79,7 +79,7 @@ module Delayed
|
|
79
79
|
end
|
80
80
|
|
81
81
|
def jobs_to_execute
|
82
|
-
Job.find_available constraints
|
82
|
+
Job.find_available constraints.merge(:unless => jobs_ids_in_execution)
|
83
83
|
end
|
84
84
|
|
85
85
|
def say(text)
|
@@ -138,7 +138,6 @@ module Delayed
|
|
138
138
|
def constraints
|
139
139
|
{:max_run_time => Job::MAX_RUN_TIME,
|
140
140
|
:worker_name => name,
|
141
|
-
:limit => 5,
|
142
141
|
:min_priority => min_priority,
|
143
142
|
:max_priority => max_priority,
|
144
143
|
:only_for => only_for,
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: blaxter-delayed_job
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 1
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 2
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 2.1.
|
9
|
+
- 5
|
10
|
+
version: 2.1.5
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- "Tobias L\xC3\xBCtke"
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2010-10-
|
19
|
+
date: 2010-10-25 00:00:00 +02:00
|
20
20
|
default_executable:
|
21
21
|
dependencies: []
|
22
22
|
|