sidekiq 3.3.0 → 3.3.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of sidekiq might be problematic. Click here for more details.

Files changed (56) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +7 -9
  3. data/Changes.md +16 -0
  4. data/Pro-2.0-Upgrade.md +102 -0
  5. data/Pro-Changes.md +14 -0
  6. data/README.md +3 -3
  7. data/Rakefile +0 -1
  8. data/bin/sidekiqctl +16 -14
  9. data/lib/sidekiq.rb +14 -14
  10. data/lib/sidekiq/api.rb +110 -40
  11. data/lib/sidekiq/cli.rb +11 -11
  12. data/lib/sidekiq/client.rb +13 -14
  13. data/lib/sidekiq/extensions/action_mailer.rb +5 -1
  14. data/lib/sidekiq/launcher.rb +4 -1
  15. data/lib/sidekiq/logging.rb +8 -7
  16. data/lib/sidekiq/manager.rb +9 -2
  17. data/lib/sidekiq/middleware/server/logging.rb +1 -1
  18. data/lib/sidekiq/middleware/server/retry_jobs.rb +4 -4
  19. data/lib/sidekiq/processor.rb +6 -6
  20. data/lib/sidekiq/testing.rb +8 -9
  21. data/lib/sidekiq/util.rb +8 -3
  22. data/lib/sidekiq/version.rb +1 -1
  23. data/lib/sidekiq/web.rb +33 -20
  24. data/lib/sidekiq/web_helpers.rb +13 -9
  25. data/lib/sidekiq/worker.rb +1 -2
  26. data/sidekiq.gemspec +1 -1
  27. data/test/test_api.rb +19 -10
  28. data/test/test_cli.rb +1 -1
  29. data/test/test_client.rb +1 -1
  30. data/test/test_exception_handler.rb +1 -1
  31. data/test/test_extensions.rb +1 -1
  32. data/test/test_fetch.rb +1 -1
  33. data/test/test_logging.rb +34 -0
  34. data/test/test_manager.rb +2 -2
  35. data/test/test_middleware.rb +1 -1
  36. data/test/test_processor.rb +1 -1
  37. data/test/test_redis_connection.rb +1 -1
  38. data/test/test_retry.rb +4 -2
  39. data/test/test_scheduled.rb +1 -1
  40. data/test/test_scheduling.rb +1 -1
  41. data/test/test_sidekiq.rb +13 -1
  42. data/test/test_testing.rb +1 -1
  43. data/test/test_testing_fake.rb +1 -1
  44. data/test/test_testing_inline.rb +1 -1
  45. data/test/test_web.rb +52 -9
  46. data/test/test_worker_generator.rb +1 -1
  47. data/web/assets/javascripts/locales/jquery.timeago.uz.js +0 -0
  48. data/web/assets/javascripts/locales/{jquery.timeago.zh-CN.js → jquery.timeago.zh-cn.js} +0 -0
  49. data/web/assets/javascripts/locales/{jquery.timeago.zh-TW.js → jquery.timeago.zh-tw.js} +0 -0
  50. data/web/assets/stylesheets/application.css +1 -4
  51. data/web/locales/ru.yml +6 -0
  52. data/web/views/_footer.erb +1 -1
  53. data/web/views/_summary.erb +1 -1
  54. data/web/views/busy.erb +3 -4
  55. data/web/views/dashboard.erb +1 -1
  56. metadata +10 -7
@@ -1,4 +1,4 @@
1
- require 'helper'
1
+ require_relative 'helper'
2
2
  require 'rails/generators/test_case'
3
3
  require 'generators/sidekiq/worker_generator'
4
4
 
@@ -1,6 +1,3 @@
1
- @import url(//fonts.googleapis.com/css?family=Gudea:400,700);
2
- @import url(//fonts.googleapis.com/css?family=Armata);
3
-
4
1
  * {
5
2
  box-sizing: border-box;
6
3
  }
@@ -32,7 +29,7 @@ h1, h2, h3, h4, h5, h6, strong {
32
29
  }
33
30
 
34
31
  .navbar-brand, .navbar .navbar-brand, h5, h4, h3, h2, h1 {
35
- font-family: Armata;
32
+ font-family: Armata, "Helvetica Neue", Helvetica, Arial, sans-serif;
36
33
  font-weight: 400;
37
34
  }
38
35
 
@@ -66,3 +66,9 @@ ru:
66
66
  Thread: Поток
67
67
  Threads: Потоки
68
68
  Jobs: Задачи
69
+ Paused: Приостановлено
70
+ Stop: Остановить
71
+ Quiet: Отдыхать
72
+ StopAll: Остановить все
73
+ QuietAll: Отдыхать всем
74
+ PollingInterval: Интервал опроса
@@ -3,7 +3,7 @@
3
3
  <div class="container text-center">
4
4
  <ul class="nav">
5
5
  <li>
6
- <p class="navbar-text" style="color:white;">Sidekiq v<%= Sidekiq::VERSION %></p>
6
+ <p class="navbar-text" style="color:white;"><%= product_version %></p>
7
7
  </li>
8
8
  <li>
9
9
  <p class="navbar-text">Redis: <%= redis_connection %></p>
@@ -9,7 +9,7 @@
9
9
  </li>
10
10
  <li class="busy col-sm-1">
11
11
  <a href="<%= root_path %>busy">
12
- <span class="count"><%= number_with_delimiter(workers_size) %></span>
12
+ <span class="count"><%= number_with_delimiter(workers.size) %></span>
13
13
  <span class="desc"><%= t('Busy') %></span>
14
14
  </a>
15
15
  </li>
@@ -21,7 +21,7 @@
21
21
  <th><%= t('Busy') %></th>
22
22
  <th>&nbsp;</th>
23
23
  </thead>
24
- <% Sidekiq::ProcessSet.new.each do |process| %>
24
+ <% processes.each do |process| %>
25
25
  <tr>
26
26
  <td width="50%">
27
27
  <%= "#{process['hostname']}:#{process['pid']}" %>
@@ -39,8 +39,7 @@
39
39
  <td>
40
40
  <div class="btn-group pull-right">
41
41
  <form method="POST">
42
- <input type="hidden" name="hostname" value="<%= process['hostname'] %>"/>
43
- <input type="hidden" name="pid" value="<%= process['pid'] %>"/>
42
+ <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
44
43
  <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
45
44
  <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
46
45
  </form>
@@ -66,7 +65,7 @@
66
65
  <th><%= t('Arguments') %></th>
67
66
  <th><%= t('Started') %></th>
68
67
  </thead>
69
- <% workers.each_with_index do |(process, thread, msg), index| %>
68
+ <% workers.each do |process, thread, msg| %>
70
69
  <% job = Sidekiq::Job.new(msg['payload']) %>
71
70
  <tr>
72
71
  <td><%= process %></td>
@@ -29,7 +29,7 @@
29
29
  <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
30
30
  </h5>
31
31
 
32
- <div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>dashboard/stats"></div>
32
+ <div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>stats"></div>
33
33
  <div id="history-legend"></div>
34
34
  </div>
35
35
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sidekiq
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.0
4
+ version: 3.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Perham
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-20 00:00:00.000000000 Z
11
+ date: 2015-01-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: redis
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 2.0.0
47
+ version: 2.1.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 2.0.0
54
+ version: 2.1.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: celluloid
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ files:
167
167
  - Contributing.md
168
168
  - Gemfile
169
169
  - LICENSE
170
+ - Pro-2.0-Upgrade.md
170
171
  - Pro-Changes.md
171
172
  - README.md
172
173
  - Rakefile
@@ -220,6 +221,7 @@ files:
220
221
  - test/test_exception_handler.rb
221
222
  - test/test_extensions.rb
222
223
  - test/test_fetch.rb
224
+ - test/test_logging.rb
223
225
  - test/test_manager.rb
224
226
  - test/test_middleware.rb
225
227
  - test/test_processor.rb
@@ -284,8 +286,8 @@ files:
284
286
  - web/assets/javascripts/locales/jquery.timeago.tr.js
285
287
  - web/assets/javascripts/locales/jquery.timeago.uk.js
286
288
  - web/assets/javascripts/locales/jquery.timeago.uz.js
287
- - web/assets/javascripts/locales/jquery.timeago.zh-CN.js
288
- - web/assets/javascripts/locales/jquery.timeago.zh-TW.js
289
+ - web/assets/javascripts/locales/jquery.timeago.zh-cn.js
290
+ - web/assets/javascripts/locales/jquery.timeago.zh-tw.js
289
291
  - web/assets/stylesheets/application.css
290
292
  - web/assets/stylesheets/bootstrap.css
291
293
  - web/locales/cs.yml
@@ -345,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
345
347
  version: '0'
346
348
  requirements: []
347
349
  rubyforge_project:
348
- rubygems_version: 2.4.1
350
+ rubygems_version: 2.4.5
349
351
  signing_key:
350
352
  specification_version: 4
351
353
  summary: Simple, efficient background processing for Ruby
@@ -361,6 +363,7 @@ test_files:
361
363
  - test/test_exception_handler.rb
362
364
  - test/test_extensions.rb
363
365
  - test/test_fetch.rb
366
+ - test/test_logging.rb
364
367
  - test/test_manager.rb
365
368
  - test/test_middleware.rb
366
369
  - test/test_processor.rb