attentive_sidekiq 0.3.1 → 0.3.3

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.
Files changed (6) hide show
  1. checksums.yaml +5 -13
  2. data/lib/attentive_sidekiq/manager.rb +9 -0
  3. data/lib/attentive_sidekiq/version.rb +1 -1
  4. data/lib/attentive_sidekiq/web.rb +3 -2
  5. data/tags +7 -5
  6. metadata +25 -25
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YWQyZTM3NDdkMzM4ODFhYjMyYWFlMDRjY2EwOWQxOGZjMTQ5MGNlYg==
5
- data.tar.gz: !binary |-
6
- NmE3MTliMjY0ZDJiZmFmOWMxYjU4ZTRiZjcyZTU0ZTNjMTRjM2M2OA==
2
+ SHA1:
3
+ metadata.gz: f638f51db0ff2f805d2a032b8b91cb7e07283585
4
+ data.tar.gz: 4ec64d3ca3aab335cfea6f2c6a57031019deb693
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- MzAyMGIzZGNkNzczZGNjOTNjNGVkNTdiNjA3ODdjOTc3NWQ3YzhlODBhZDU1
10
- MzM3YmI4NjEwYzc2YmQ1NGExNmVlNDcyZjUzNGU3ZTE2NzA4MjNmYTY5N2U3
11
- ZmIxYWFlNGI3Yjg1MzNlOTEzN2Y1MjMwMDE0M2I3NDgwMGQ1ZTY=
12
- data.tar.gz: !binary |-
13
- MzM5Nzg3YTc0MGM3MzlhMTFhODY5OTdjYmYwZDAzZGRiMGIxZTUxMzI4MmY5
14
- YmU1YzZiMWZjNWQ5ZjQzZDZhOGNkMmI3NWZlNzRjOGRmMzZiM2I5NWFlY2Ji
15
- MzFiMDkxYzEyZDg4YzVkZjYyNDAwNTc1MjBmMWJiNWQxNzU3NDk=
6
+ metadata.gz: 613d86806f076925702b44bd01992a13bc4f2188dcabbb5929129a284d06dd775d7627f8098143f90b699eee31ccf3dfb9eb2fd0d66a0fcbaf55c0597f172f8a
7
+ data.tar.gz: 4d24f613e7916fcb837bd00572f2bad9d6682d0d5e10cc62b5d1ef3ecf65aae2b9dd2b3129ee20b2a1a56be44de8b8968aec3ba545e9ddae92b5ddb619385666
data/lib/attentive_sidekiq/manager.rb CHANGED
@@ -18,6 +18,15 @@ module AttentiveSidekiq
18
18
  suspicious = AttentiveSidekiq::Suspicious.jobs
19
19
  active_ids = AttentiveSidekiq::Active.job_ids
20
20
  those_lost = suspicious.delete_if{|i| active_ids.include?(i["jid"])}
21
+
22
+ # Sidekiq might have been too fast finishing up a job that appeared in the suspicious list
23
+ # but didn't make it to the active list, so that's a false-positive.
24
+ # We need to get the new suspicious list again, and remove any lost jobs that are no longer there.
25
+ # Those jobs that appeared in the first suspicious list, but not the second one were simply finished
26
+ # quickly by Sidekiq before showing up as active by a worker.
27
+ suspicious = AttentiveSidekiq::Suspicious.jobs
28
+ those_lost.delete_if{|i| !suspicious.any?{|j| i['jid'] == j['jid']} }
29
+
21
30
  those_lost.each do |job|
22
31
  Disappeared.add(job)
23
32
  Suspicious.remove(job['jid'])
data/lib/attentive_sidekiq/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module AttentiveSidekiq
2
- VERSION = '0.3.1'.freeze
2
+ VERSION = '0.3.3'.freeze
3
3
  end
data/lib/attentive_sidekiq/web.rb CHANGED
@@ -10,8 +10,9 @@ module AttentiveSidekiq
10
10
 
11
11
  app.post("/disappeared-jobs/requeue-all") do
12
12
  AttentiveSidekiq::Disappeared.jobs.each do |job|
13
- next if job['status'] # Skip already reenqueued jobs
14
- AttentiveSidekiq::Disappeared.requeue(job['jid'])
13
+ if job['status'] == 'detected'
14
+ AttentiveSidekiq::Disappeared.requeue(job['jid'])
15
+ end
15
16
  end
16
17
  redirect "#{root_path}disappeared-jobs"
17
18
  end
data/tags CHANGED
@@ -48,7 +48,7 @@ Suggestions? Bugs? README.md /^### Suggestions? Bugs?$/;" k line:91
48
48
  Suspicious lib/attentive_sidekiq/api.rb /^ class Suspicious < RedisBasedHash$/;" c line:50
49
49
  UpdaterObserver lib/attentive_sidekiq/updater_observer.rb /^ class UpdaterObserver$/;" c line:2 class:AttentiveSidekiq
50
50
  Usage README.md /^### Usage$/;" k line:15
51
- VERSION lib/attentive_sidekiq/version.rb /^ VERSION = "0.3.0"$/;" c line:2
51
+ VERSION lib/attentive_sidekiq/version.rb /^ VERSION = '0.3.3'.freeze$/;" c line:2
52
52
  VIEW_PATH lib/attentive_sidekiq/web.rb /^ VIEW_PATH = File.expand_path("..\/web\/views", __FILE__)$/;" c line:3
53
53
  Web lib/attentive_sidekiq/web.rb /^ module Web$/;" m line:2 class:AttentiveSidekiq
54
54
  WebTest test/web_test.rb /^class WebTest < Minitest::Test$/;" c line:4
@@ -57,7 +57,7 @@ add lib/attentive_sidekiq/api.rb /^ def add item$/;" f line:16 class:Attent
57
57
  add lib/attentive_sidekiq/api.rb /^ def add item$/;" f line:33 class:Disappeared
58
58
  api.rb lib/attentive_sidekiq/api.rb 1;" F line:1
59
59
  api_test.rb test/api_test.rb 1;" F line:1
60
- app test/web_test.rb /^ def app$/;" f line:49 class:WebTest
60
+ app test/web_test.rb /^ def app$/;" f line:65 class:WebTest
61
61
  attentionist.rb lib/attentive_sidekiq/middleware/client/attentionist.rb 1;" F line:1
62
62
  attentionist.rb lib/attentive_sidekiq/middleware/server/attentionist.rb 1;" F line:1
63
63
  attentive_sidekiq.rb lib/attentive_sidekiq.rb 1;" F line:1
@@ -81,7 +81,7 @@ manager test/server_middleware_test.rb /^ def manager$/;" f line:47 class:S
81
81
  manager.rb lib/attentive_sidekiq/manager.rb 1;" F line:1
82
82
  manager_test.rb test/manager_test.rb 1;" F line:1
83
83
  options lib/attentive_sidekiq.rb /^ def options$/;" f line:39 class:AttentiveSidekiq
84
- options lib/attentive_sidekiq/manager.rb /^ def options$/;" f line:31 class:AttentiveSidekiq.Manager
84
+ options lib/attentive_sidekiq/manager.rb /^ def options$/;" f line:40 class:AttentiveSidekiq.Manager
85
85
  perform test/api_test.rb /^ def perform a, b, c$/;" f line:32 class:ApiTest.WorkerWithArgs
86
86
  perform test/api_test.rb /^ def perform$/;" f line:27 class:ApiTest.SimpleWorker
87
87
  perform test/server_middleware_test.rb /^ def perform(seed, work_amount = 10)$/;" f line:16 class:ServerMiddlewareTest.HardWorker
@@ -96,11 +96,13 @@ setup test/web_test.rb /^ def setup$/;" f line:7 class:WebTest
96
96
  size test/server_middleware_test.rb /^ def size$/;" f line:66 class:ServerMiddlewareTest.DefaultQueue
97
97
  start! lib/attentive_sidekiq/manager.rb /^ def start!$/;" f line:9 class:AttentiveSidekiq.Manager
98
98
  suspicious_now test/manager_test.rb /^ def suspicious_now$/;" f line:37
99
- test_delete_route_functions_fine test/web_test.rb /^ def test_delete_route_functions_fine$/;" f line:31 class:WebTest
99
+ test_delete_all_route_functions_fine test/web_test.rb /^ def test_delete_all_route_functions_fine$/;" f line:31 class:WebTest
100
+ test_delete_route_functions_fine test/web_test.rb /^ def test_delete_route_functions_fine$/;" f line:47 class:WebTest
100
101
  test_displays_jobs_in_disappeared_hash test/web_test.rb /^ def test_displays_jobs_in_disappeared_hash$/;" f line:19 class:WebTest
101
102
  test_does_not_display_jobs_not_in_disappeared_hash test/web_test.rb /^ def test_does_not_display_jobs_not_in_disappeared_hash$/;" f line:25 class:WebTest
102
103
  test_helper.rb test/test_helper.rb 1;" F line:1
103
- test_requeue_route_functions_fine test/web_test.rb /^ def test_requeue_route_functions_fine$/;" f line:39 class:WebTest
104
+ test_requeue_all_route_functions_fine test/web_test.rb /^ def test_requeue_all_route_functions_fine$/;" f line:39 class:WebTest
105
+ test_requeue_route_functions_fine test/web_test.rb /^ def test_requeue_route_functions_fine$/;" f line:55 class:WebTest
104
106
  timeout_interval lib/attentive_sidekiq.rb /^ def timeout_interval$/;" f line:25 class:AttentiveSidekiq
105
107
  update lib/attentive_sidekiq/updater_observer.rb /^ def update time, result, ex$/;" f line:3 class:AttentiveSidekiq.UpdaterObserver
106
108
  update_disappeared_jobs lib/attentive_sidekiq/manager.rb /^ def update_disappeared_jobs$/;" f line:17 class:AttentiveSidekiq.Manager
metadata CHANGED
@@ -1,153 +1,153 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: attentive_sidekiq
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - twonegatives
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-26 00:00:00.000000000 Z
11
+ date: 2018-01-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sidekiq
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '4.2'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '4.2'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '11.3'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '11.3'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: minitest
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '5.0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '5.0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: minitest-stub_any_instance
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ! '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ! '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: redis-namespace
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '1.5'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1.5'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rack-test
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0.6'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0.6'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0.10'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0.10'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: pry-byebug
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ! '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ! '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: activesupport
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ! '>='
129
+ - - ">="
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ! '>='
136
+ - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: concurrent-ruby
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ~>
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
145
  version: '1.0'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ~>
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: '1.0'
153
153
  description: This gem allows you to watch the jobs which suddenly dissappeared from
@@ -192,17 +192,17 @@ require_paths:
192
192
  - lib
193
193
  required_ruby_version: !ruby/object:Gem::Requirement
194
194
  requirements:
195
- - - ! '>='
195
+ - - ">="
196
196
  - !ruby/object:Gem::Version
197
197
  version: '0'
198
198
  required_rubygems_version: !ruby/object:Gem::Requirement
199
199
  requirements:
200
- - - ! '>='
200
+ - - ">="
201
201
  - !ruby/object:Gem::Version
202
202
  version: '0'
203
203
  requirements: []
204
204
  rubyforge_project:
205
- rubygems_version: 2.6.11
205
+ rubygems_version: 2.6.10
206
206
  signing_key:
207
207
  specification_version: 4
208
208
  summary: Make your sidekiq to be attentive to lost jobs