resque_manager 3.3.4 → 3.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/resque_manager/resque_controller.rb +244 -242
- data/lib/resque_manager/overrides/resque/worker.rb +20 -57
- data/lib/resque_manager/overrides/resque_status/status.rb +3 -2
- data/lib/resque_manager/recipes.rb +2 -2
- data/lib/resque_manager/version.rb +1 -1
- data/lib/tasks/worker.rake +1 -1
- data/test/dummy/config/application.rb +0 -1
- data/test/dummy/log/test.log +5575 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/0eddc19d46318e2e286cc171ae4cc73e +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/0fa6e3c14356aa527d68a8d56fa37f28 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/1efd074fd1074b3dc88145b480ff961f +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/60ffef45ddefd5c7746d17977fff0717 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/67f1ef70e7ede542318b8d55e25b16c3 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/73d6fa09352cb76ac81e1683e832b93f +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/74e5ba1cca7a1470d53c54fb60368b78 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/8ed12e4193473760f95b973567a8c206 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/97119b908ebed2633edfd00ac90d9011 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/989465d3ea8575dd0b54981a9e8add38 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/a26f2ae225aa4b87c462d540c7cf43f9 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/b2e622954654f415590723e9b882063e +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/c387148880e015d1eab0dc838b326022 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/d91a5918f5aa43a43c8135a67c78e989 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/e1207380d69eeee3284e02636c26f24a +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/e227278d3c65d8aa1159da720263f771 +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/ea4f3c726fc1046cad1ad243faf84e7d +0 -0
- data/test/dummy/tmp/cache/assets/test/sprockets/ec164819553e2e5b28f1efc9bd970978 +0 -0
- data/test/functional/resque_manager/resque_controller_test.rb +2 -2
- data/test/unit/overrides/resque_status/status_test.rb +3 -3
- metadata +52 -2
@@ -156,9 +156,9 @@ module ResqueManager
|
|
156
156
|
|
157
157
|
context '#add_scheduled_job' do
|
158
158
|
should 'have an error for a name already existing and missing ip and missing cron' do
|
159
|
-
|
159
|
+
Resque.expects(:schedule).returns('key' => 'some schedule')
|
160
160
|
# Stub on array instead of Resque.schedule.keys otherwise the stub never works.
|
161
|
-
Array.any_instance.expects(:include?).returns(true).at_least_once
|
161
|
+
#Array.any_instance.expects(:include?).with('key').returns(true).at_least_once
|
162
162
|
post :add_scheduled_job, {name: 'key', use_route: :resque_manager}
|
163
163
|
assert_redirected_to '/resque/schedule'
|
164
164
|
errors = flash[:error].split('<br>')
|
@@ -126,7 +126,7 @@ class StatusTest < Test::Unit::TestCase
|
|
126
126
|
should 'rescue Killed' do
|
127
127
|
# Stub on the hash not the actual status because it will change and wont be stubbed on the right status object
|
128
128
|
Resque::Plugins::Status::Hash.expects(:should_kill?).returns(true)
|
129
|
-
|
129
|
+
DataContributionFile.logger.expects(:info).with("Job #{@data_contribution} Killed at #{@now}")
|
130
130
|
Resque::Plugins::Status::Hash.expects(:killed).with(@uuid)
|
131
131
|
assert_nothing_raised(Resque::Plugins::Status::Killed) { @data_contribution.safe_perform! }
|
132
132
|
end
|
@@ -135,7 +135,7 @@ class StatusTest < Test::Unit::TestCase
|
|
135
135
|
e = Exception.new('exception')
|
136
136
|
Resque::Plugins::Status::Hash.expects(:should_kill?).returns(true)
|
137
137
|
@data_contribution.stubs(:kill!).raises(e)
|
138
|
-
|
138
|
+
DataContributionFile.logger.expects(:error).with('The task failed because of an error:', e)
|
139
139
|
@data_contribution.expects(:on_failure).with(e)
|
140
140
|
assert_nothing_raised(Exception) { @data_contribution.safe_perform! }
|
141
141
|
end
|
@@ -144,7 +144,7 @@ class StatusTest < Test::Unit::TestCase
|
|
144
144
|
e = Exception.new('exception')
|
145
145
|
Resque::Plugins::Status::Hash.expects(:should_kill?).returns(true)
|
146
146
|
@data_contribution.stubs(:kill!).raises(e)
|
147
|
-
|
147
|
+
DataContributionFile.logger.expects(:error).with('The task failed because of an error:', e)
|
148
148
|
@data_contribution.expects(:respond_to?).returns(false)
|
149
149
|
assert_raises(Exception) { @data_contribution.safe_perform! }
|
150
150
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: resque_manager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.3.
|
4
|
+
version: 3.3.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kevin Tyll
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-02-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -108,6 +108,20 @@ dependencies:
|
|
108
108
|
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '0'
|
111
|
+
- !ruby/object:Gem::Dependency
|
112
|
+
name: semantic_logger
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
114
|
+
requirements:
|
115
|
+
- - ">="
|
116
|
+
- !ruby/object:Gem::Version
|
117
|
+
version: '0'
|
118
|
+
type: :runtime
|
119
|
+
prerelease: false
|
120
|
+
version_requirements: !ruby/object:Gem::Requirement
|
121
|
+
requirements:
|
122
|
+
- - ">="
|
123
|
+
- !ruby/object:Gem::Version
|
124
|
+
version: '0'
|
111
125
|
- !ruby/object:Gem::Dependency
|
112
126
|
name: mocha
|
113
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -277,6 +291,24 @@ files:
|
|
277
291
|
- test/dummy/tmp/cache/assets/DF5/480/sprockets%2Fea4f3c726fc1046cad1ad243faf84e7d
|
278
292
|
- test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
|
279
293
|
- test/dummy/tmp/cache/assets/E2B/7A0/sprockets%2Fd44ef07be0aa6d5b5dea4d37d7f72b4f
|
294
|
+
- test/dummy/tmp/cache/assets/test/sprockets/0eddc19d46318e2e286cc171ae4cc73e
|
295
|
+
- test/dummy/tmp/cache/assets/test/sprockets/0fa6e3c14356aa527d68a8d56fa37f28
|
296
|
+
- test/dummy/tmp/cache/assets/test/sprockets/1efd074fd1074b3dc88145b480ff961f
|
297
|
+
- test/dummy/tmp/cache/assets/test/sprockets/60ffef45ddefd5c7746d17977fff0717
|
298
|
+
- test/dummy/tmp/cache/assets/test/sprockets/67f1ef70e7ede542318b8d55e25b16c3
|
299
|
+
- test/dummy/tmp/cache/assets/test/sprockets/73d6fa09352cb76ac81e1683e832b93f
|
300
|
+
- test/dummy/tmp/cache/assets/test/sprockets/74e5ba1cca7a1470d53c54fb60368b78
|
301
|
+
- test/dummy/tmp/cache/assets/test/sprockets/8ed12e4193473760f95b973567a8c206
|
302
|
+
- test/dummy/tmp/cache/assets/test/sprockets/97119b908ebed2633edfd00ac90d9011
|
303
|
+
- test/dummy/tmp/cache/assets/test/sprockets/989465d3ea8575dd0b54981a9e8add38
|
304
|
+
- test/dummy/tmp/cache/assets/test/sprockets/a26f2ae225aa4b87c462d540c7cf43f9
|
305
|
+
- test/dummy/tmp/cache/assets/test/sprockets/b2e622954654f415590723e9b882063e
|
306
|
+
- test/dummy/tmp/cache/assets/test/sprockets/c387148880e015d1eab0dc838b326022
|
307
|
+
- test/dummy/tmp/cache/assets/test/sprockets/d91a5918f5aa43a43c8135a67c78e989
|
308
|
+
- test/dummy/tmp/cache/assets/test/sprockets/e1207380d69eeee3284e02636c26f24a
|
309
|
+
- test/dummy/tmp/cache/assets/test/sprockets/e227278d3c65d8aa1159da720263f771
|
310
|
+
- test/dummy/tmp/cache/assets/test/sprockets/ea4f3c726fc1046cad1ad243faf84e7d
|
311
|
+
- test/dummy/tmp/cache/assets/test/sprockets/ec164819553e2e5b28f1efc9bd970978
|
280
312
|
- test/functional/resque_manager/resque_controller_test.rb
|
281
313
|
- test/resque_manager_test.rb
|
282
314
|
- test/test_helper.rb
|
@@ -374,6 +406,24 @@ test_files:
|
|
374
406
|
- test/dummy/tmp/cache/assets/DF5/480/sprockets%2Fea4f3c726fc1046cad1ad243faf84e7d
|
375
407
|
- test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
|
376
408
|
- test/dummy/tmp/cache/assets/E2B/7A0/sprockets%2Fd44ef07be0aa6d5b5dea4d37d7f72b4f
|
409
|
+
- test/dummy/tmp/cache/assets/test/sprockets/0eddc19d46318e2e286cc171ae4cc73e
|
410
|
+
- test/dummy/tmp/cache/assets/test/sprockets/0fa6e3c14356aa527d68a8d56fa37f28
|
411
|
+
- test/dummy/tmp/cache/assets/test/sprockets/1efd074fd1074b3dc88145b480ff961f
|
412
|
+
- test/dummy/tmp/cache/assets/test/sprockets/60ffef45ddefd5c7746d17977fff0717
|
413
|
+
- test/dummy/tmp/cache/assets/test/sprockets/67f1ef70e7ede542318b8d55e25b16c3
|
414
|
+
- test/dummy/tmp/cache/assets/test/sprockets/73d6fa09352cb76ac81e1683e832b93f
|
415
|
+
- test/dummy/tmp/cache/assets/test/sprockets/74e5ba1cca7a1470d53c54fb60368b78
|
416
|
+
- test/dummy/tmp/cache/assets/test/sprockets/8ed12e4193473760f95b973567a8c206
|
417
|
+
- test/dummy/tmp/cache/assets/test/sprockets/97119b908ebed2633edfd00ac90d9011
|
418
|
+
- test/dummy/tmp/cache/assets/test/sprockets/989465d3ea8575dd0b54981a9e8add38
|
419
|
+
- test/dummy/tmp/cache/assets/test/sprockets/a26f2ae225aa4b87c462d540c7cf43f9
|
420
|
+
- test/dummy/tmp/cache/assets/test/sprockets/b2e622954654f415590723e9b882063e
|
421
|
+
- test/dummy/tmp/cache/assets/test/sprockets/c387148880e015d1eab0dc838b326022
|
422
|
+
- test/dummy/tmp/cache/assets/test/sprockets/d91a5918f5aa43a43c8135a67c78e989
|
423
|
+
- test/dummy/tmp/cache/assets/test/sprockets/e1207380d69eeee3284e02636c26f24a
|
424
|
+
- test/dummy/tmp/cache/assets/test/sprockets/e227278d3c65d8aa1159da720263f771
|
425
|
+
- test/dummy/tmp/cache/assets/test/sprockets/ea4f3c726fc1046cad1ad243faf84e7d
|
426
|
+
- test/dummy/tmp/cache/assets/test/sprockets/ec164819553e2e5b28f1efc9bd970978
|
377
427
|
- test/functional/resque_manager/resque_controller_test.rb
|
378
428
|
- test/resque_manager_test.rb
|
379
429
|
- test/test_helper.rb
|