sidekiq 4.2.4 → 5.2.10
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.
- checksums.yaml +5 -5
- data/.circleci/config.yml +61 -0
- data/.github/issue_template.md +8 -1
- data/.gitignore +3 -0
- data/.travis.yml +5 -6
- data/5.0-Upgrade.md +56 -0
- data/COMM-LICENSE +12 -10
- data/Changes.md +220 -0
- data/Ent-Changes.md +94 -2
- data/Gemfile +12 -22
- data/LICENSE +1 -1
- data/Pro-4.0-Upgrade.md +35 -0
- data/Pro-Changes.md +176 -2
- data/README.md +10 -7
- data/Rakefile +3 -3
- data/bin/sidekiqctl +13 -92
- data/bin/sidekiqload +16 -34
- data/lib/generators/sidekiq/templates/worker_spec.rb.erb +1 -1
- data/lib/generators/sidekiq/templates/worker_test.rb.erb +1 -1
- data/lib/sidekiq/api.rb +166 -68
- data/lib/sidekiq/cli.rb +122 -77
- data/lib/sidekiq/client.rb +25 -18
- data/lib/sidekiq/core_ext.rb +1 -106
- data/lib/sidekiq/ctl.rb +221 -0
- data/lib/sidekiq/delay.rb +42 -0
- data/lib/sidekiq/exception_handler.rb +2 -4
- data/lib/sidekiq/extensions/generic_proxy.rb +7 -1
- data/lib/sidekiq/fetch.rb +1 -1
- data/lib/sidekiq/job_logger.rb +25 -0
- data/lib/sidekiq/job_retry.rb +262 -0
- data/lib/sidekiq/launcher.rb +49 -40
- data/lib/sidekiq/logging.rb +18 -2
- data/lib/sidekiq/manager.rb +6 -7
- data/lib/sidekiq/middleware/server/active_record.rb +10 -0
- data/lib/sidekiq/processor.rb +127 -37
- data/lib/sidekiq/rails.rb +16 -51
- data/lib/sidekiq/redis_connection.rb +50 -5
- data/lib/sidekiq/scheduled.rb +35 -8
- data/lib/sidekiq/testing.rb +24 -7
- data/lib/sidekiq/util.rb +6 -2
- data/lib/sidekiq/version.rb +1 -1
- data/lib/sidekiq/web/action.rb +3 -7
- data/lib/sidekiq/web/application.rb +38 -22
- data/lib/sidekiq/web/helpers.rb +78 -27
- data/lib/sidekiq/web/router.rb +14 -10
- data/lib/sidekiq/web.rb +4 -4
- data/lib/sidekiq/worker.rb +118 -19
- data/lib/sidekiq.rb +27 -26
- data/sidekiq.gemspec +8 -13
- data/web/assets/javascripts/application.js +0 -0
- data/web/assets/javascripts/dashboard.js +33 -18
- data/web/assets/stylesheets/application-rtl.css +246 -0
- data/web/assets/stylesheets/application.css +371 -6
- data/web/assets/stylesheets/bootstrap-rtl.min.css +9 -0
- data/web/assets/stylesheets/bootstrap.css +2 -2
- data/web/locales/ar.yml +81 -0
- data/web/locales/en.yml +2 -0
- data/web/locales/es.yml +4 -3
- data/web/locales/fa.yml +80 -0
- data/web/locales/he.yml +79 -0
- data/web/locales/ja.yml +5 -3
- data/web/locales/ur.yml +80 -0
- data/web/views/_footer.erb +5 -2
- data/web/views/_job_info.erb +1 -1
- data/web/views/_nav.erb +4 -18
- data/web/views/_paging.erb +1 -1
- data/web/views/busy.erb +9 -5
- data/web/views/dashboard.erb +3 -3
- data/web/views/layout.erb +11 -2
- data/web/views/morgue.erb +14 -10
- data/web/views/queue.erb +11 -10
- data/web/views/queues.erb +4 -2
- data/web/views/retries.erb +17 -11
- data/web/views/retry.erb +1 -1
- data/web/views/scheduled.erb +2 -2
- metadata +32 -151
- data/lib/sidekiq/middleware/server/logging.rb +0 -40
- data/lib/sidekiq/middleware/server/retry_jobs.rb +0 -205
- data/test/config.yml +0 -9
- data/test/env_based_config.yml +0 -11
- data/test/fake_env.rb +0 -1
- data/test/fixtures/en.yml +0 -2
- data/test/helper.rb +0 -75
- data/test/test_actors.rb +0 -138
- data/test/test_api.rb +0 -528
- data/test/test_cli.rb +0 -418
- data/test/test_client.rb +0 -266
- data/test/test_exception_handler.rb +0 -56
- data/test/test_extensions.rb +0 -127
- data/test/test_fetch.rb +0 -50
- data/test/test_launcher.rb +0 -95
- data/test/test_logging.rb +0 -35
- data/test/test_manager.rb +0 -50
- data/test/test_middleware.rb +0 -158
- data/test/test_processor.rb +0 -235
- data/test/test_rails.rb +0 -22
- data/test/test_redis_connection.rb +0 -132
- data/test/test_retry.rb +0 -326
- data/test/test_retry_exhausted.rb +0 -149
- data/test/test_scheduled.rb +0 -115
- data/test/test_scheduling.rb +0 -58
- data/test/test_sidekiq.rb +0 -107
- data/test/test_testing.rb +0 -143
- data/test/test_testing_fake.rb +0 -357
- data/test/test_testing_inline.rb +0 -94
- data/test/test_util.rb +0 -13
- data/test/test_web.rb +0 -726
- data/test/test_web_helpers.rb +0 -54
data/web/locales/en.yml
CHANGED
@@ -39,6 +39,7 @@ en: # <---- change this to your locale code
|
|
39
39
|
AreYouSure: Are you sure?
|
40
40
|
DeleteAll: Delete All
|
41
41
|
RetryAll: Retry All
|
42
|
+
KillAll: Kill All
|
42
43
|
NoRetriesFound: No retries were found
|
43
44
|
Error: Error
|
44
45
|
ErrorClass: Error Class
|
@@ -77,3 +78,4 @@ en: # <---- change this to your locale code
|
|
77
78
|
NotYetEnqueued: Not yet enqueued
|
78
79
|
CreatedAt: Created At
|
79
80
|
BackToApp: Back to App
|
81
|
+
Latency: Latency
|
data/web/locales/es.yml
CHANGED
@@ -11,11 +11,11 @@ es:
|
|
11
11
|
Failed: Fallidas
|
12
12
|
Scheduled: Programadas
|
13
13
|
Retries: Reintentos
|
14
|
-
Enqueued: En
|
14
|
+
Enqueued: En Cola
|
15
15
|
Worker: Trabajador
|
16
16
|
LivePoll: Sondeo en Vivo
|
17
17
|
StopPolling: Detener Sondeo
|
18
|
-
Queue:
|
18
|
+
Queue: Cola
|
19
19
|
Class: Clase
|
20
20
|
Job: Trabajo
|
21
21
|
Arguments: Argumentos
|
@@ -27,7 +27,7 @@ es:
|
|
27
27
|
AddToQueue: Añadir a fila
|
28
28
|
AreYouSureDeleteJob: ¿Estás seguro de eliminar este trabajo?
|
29
29
|
AreYouSureDeleteQueue: ¿Estás seguro de eliminar la fila %{queue}?
|
30
|
-
Queues:
|
30
|
+
Queues: Colas
|
31
31
|
Size: Tamaño
|
32
32
|
Actions: Acciones
|
33
33
|
NextRetry: Siguiente Intento
|
@@ -67,3 +67,4 @@ es:
|
|
67
67
|
Thread: Hilo
|
68
68
|
Threads: Hilos
|
69
69
|
Jobs: Trabajos
|
70
|
+
Latency: Latencia
|
data/web/locales/fa.yml
ADDED
@@ -0,0 +1,80 @@
|
|
1
|
+
# elements like %{queue} are variables and should not be translated
|
2
|
+
fa: # <---- change this to your locale code
|
3
|
+
TextDirection: 'rtl'
|
4
|
+
Dashboard: داشبورد
|
5
|
+
Status: اعلان
|
6
|
+
Time: رمان
|
7
|
+
Namespace: فضای نام
|
8
|
+
Realtime: زنده
|
9
|
+
History: تاریخچه
|
10
|
+
Busy: مشغول
|
11
|
+
Processed: پردازش شده
|
12
|
+
Failed: ناموفق
|
13
|
+
Scheduled: زمان بندی
|
14
|
+
Retries: تکرار
|
15
|
+
Enqueued: صف بندی نشدند
|
16
|
+
Worker: کارگزار
|
17
|
+
LivePoll: Live Poll
|
18
|
+
StopPolling: Stop Polling
|
19
|
+
Queue: صف
|
20
|
+
Class: کلاس
|
21
|
+
Job: کار
|
22
|
+
Arguments: آرگومنت
|
23
|
+
Extras: اضافی
|
24
|
+
Started: شروع شده
|
25
|
+
ShowAll: نمایش همه
|
26
|
+
CurrentMessagesInQueue: کار فعلی در <span class='title'>%{queue}</span>
|
27
|
+
Delete: حذف
|
28
|
+
AddToQueue: افزودن به صف
|
29
|
+
AreYouSureDeleteJob: آیا شما مطمعن هستید از حذف این کار ؟
|
30
|
+
AreYouSureDeleteQueue: ایا شما مطمعنید از حذف %{queue} ?
|
31
|
+
Queues: صف ها
|
32
|
+
Size: سایز
|
33
|
+
Actions: اعمال
|
34
|
+
NextRetry: بار دیگر تلاش کنید
|
35
|
+
RetryCount: تعداد تلاش ها
|
36
|
+
RetryNow: تلاش مجدد
|
37
|
+
Kill: کشتن
|
38
|
+
LastRetry: آخرین تلاش
|
39
|
+
OriginallyFailed: Originally Failed
|
40
|
+
AreYouSure: آیا مطمعن هستید?
|
41
|
+
DeleteAll: حذف همه
|
42
|
+
RetryAll: تلاش مجدد برای همه
|
43
|
+
NoRetriesFound: هیچ تلاش پیدا نشد
|
44
|
+
Error: خطا
|
45
|
+
ErrorClass: خطا کلاس
|
46
|
+
ErrorMessage: پیغام خطا
|
47
|
+
ErrorBacktrace: خطای معکوس
|
48
|
+
GoBack: ← برگشت
|
49
|
+
NoScheduledFound: هیچ کار برنامه ریزی شده ای یافت نشد
|
50
|
+
When: وقتی که
|
51
|
+
ScheduledJobs: کار برنامه ریزی شده
|
52
|
+
idle: بیهودی
|
53
|
+
active: فعال
|
54
|
+
Version: ورژن
|
55
|
+
Connections: ارتباطات
|
56
|
+
MemoryUsage: حافظه استفاده شده
|
57
|
+
PeakMemoryUsage: اوج حافظه استفاده شده
|
58
|
+
Uptime: آپ تایم (روز)
|
59
|
+
OneWeek: ۱ هفته
|
60
|
+
OneMonth: ۱ ماه
|
61
|
+
ThreeMonths: ۳ ماه
|
62
|
+
SixMonths: ۶ ماه
|
63
|
+
Failures: شکست ها
|
64
|
+
DeadJobs: کار مرده
|
65
|
+
NoDeadJobsFound: کار مرده ای یافت نشد
|
66
|
+
Dead: مرده
|
67
|
+
Processes: پردازش ها
|
68
|
+
Thread: رشته
|
69
|
+
Threads: رشته ها
|
70
|
+
Jobs: کار ها
|
71
|
+
Paused: مکث
|
72
|
+
Stop: توقف
|
73
|
+
Quiet: خروج
|
74
|
+
StopAll: توقف همه
|
75
|
+
QuietAll: خروج همه
|
76
|
+
PollingInterval: Polling interval
|
77
|
+
Plugins: پلاگین ها
|
78
|
+
NotYetEnqueued: بدون صف بندی
|
79
|
+
CreatedAt: ساخته شده در
|
80
|
+
BackToApp: برگشت به برنامه
|
data/web/locales/he.yml
ADDED
@@ -0,0 +1,79 @@
|
|
1
|
+
he:
|
2
|
+
TextDirection: 'rtl'
|
3
|
+
Dashboard: לוח מחוונים
|
4
|
+
Status: מצב
|
5
|
+
Time: שעה
|
6
|
+
Namespace: מרחב שם
|
7
|
+
Realtime: זמן אמת
|
8
|
+
History: היסטוריה
|
9
|
+
Busy: עסוקים
|
10
|
+
Processed: עובדו
|
11
|
+
Failed: נכשלו
|
12
|
+
Scheduled: מתוכננים
|
13
|
+
Retries: נסיונות חוזרים
|
14
|
+
Enqueued: בתור
|
15
|
+
Worker: עובד
|
16
|
+
LivePoll: תשאול חי
|
17
|
+
StopPolling: עצור תשאול
|
18
|
+
Queue: תור
|
19
|
+
Class: מחלקה
|
20
|
+
Job: עבודה
|
21
|
+
Arguments: ארגומנטים
|
22
|
+
Extras: תוספות
|
23
|
+
Started: הותחלו
|
24
|
+
ShowAll: הצג את הכל
|
25
|
+
CurrentMessagesInQueue: עבודות נוכחיות בתור <span class='title'>%{queue}</span>
|
26
|
+
Delete: מחק
|
27
|
+
AddToQueue: הוסף לתור
|
28
|
+
AreYouSureDeleteJob: האם אתם בטוחים שברצונכם למחוק את העבודה הזאת?
|
29
|
+
AreYouSureDeleteQueue: האם אתם בטוחים שברצונכם למחוק את התור %{queue}?
|
30
|
+
Queues: תורים
|
31
|
+
Size: אורך
|
32
|
+
Actions: פעולות
|
33
|
+
NextRetry: ניסיון חוזר הבא
|
34
|
+
RetryCount: מספר נסיונות חוזרים
|
35
|
+
RetryNow: נסה שוב עכשיו
|
36
|
+
Kill: הרוג
|
37
|
+
LastRetry: ניסיון חוזר אחרון
|
38
|
+
OriginallyFailed: נכשל בניסיון הראשון
|
39
|
+
AreYouSure: אתם בטוחים?
|
40
|
+
DeleteAll: מחק הכל
|
41
|
+
RetryAll: נסה שוב את הכל
|
42
|
+
NoRetriesFound: לא נמצאו נסיונות חוזרים
|
43
|
+
Error: שגיאה
|
44
|
+
ErrorClass: סוג השגיאה
|
45
|
+
ErrorMessage: הודעת השגיאה
|
46
|
+
ErrorBacktrace: מעקב לאחור של השגיאה
|
47
|
+
GoBack: ← אחורה
|
48
|
+
NoScheduledFound: לא נמצאו עבודות מתוכננות
|
49
|
+
When: מתי
|
50
|
+
ScheduledJobs: עבודות מתוכננות
|
51
|
+
idle: במנוחה
|
52
|
+
active: פעיל
|
53
|
+
Version: גירסה
|
54
|
+
Connections: חיבורים
|
55
|
+
MemoryUsage: שימוש בזיכרון
|
56
|
+
PeakMemoryUsage: שיא השימוש בזיכרון
|
57
|
+
Uptime: זמן פעילות (ימים)
|
58
|
+
OneWeek: שבוע 1
|
59
|
+
OneMonth: חודש 1
|
60
|
+
ThreeMonths: 3 חדשים
|
61
|
+
SixMonths: 6 חדשים
|
62
|
+
Failures: כשלונות
|
63
|
+
DeadJobs: עבודות מתות
|
64
|
+
NoDeadJobsFound: לא נמצאו עבודות מתות
|
65
|
+
Dead: מתים
|
66
|
+
Processes: תהליכים
|
67
|
+
Thread: חוט
|
68
|
+
Threads: חוטים
|
69
|
+
Jobs: עבודות
|
70
|
+
Paused: הופסקו
|
71
|
+
Stop: עצור
|
72
|
+
Quiet: שקט
|
73
|
+
StopAll: עצור הכל
|
74
|
+
QuietAll: השקט את כולם
|
75
|
+
PollingInterval: מרווח זמן בין תשאולים
|
76
|
+
Plugins: תוספים
|
77
|
+
NotYetEnqueued: עוד לא בתור
|
78
|
+
CreatedAt: נוצר ב
|
79
|
+
BackToApp: חזרה לאפליקציה
|
data/web/locales/ja.yml
CHANGED
@@ -60,9 +60,9 @@ ja:
|
|
60
60
|
SixMonths: 6 ヶ月
|
61
61
|
Batches: バッチ
|
62
62
|
Failures: 失敗
|
63
|
-
DeadJobs:
|
64
|
-
NoDeadJobsFound:
|
65
|
-
Dead:
|
63
|
+
DeadJobs: デッドジョブ
|
64
|
+
NoDeadJobsFound: デッドジョブはありません
|
65
|
+
Dead: デッド
|
66
66
|
Processes: プロセス
|
67
67
|
Thread: スレッド
|
68
68
|
Threads: スレッド
|
@@ -76,3 +76,5 @@ ja:
|
|
76
76
|
Plugins: プラグイン
|
77
77
|
NotYetEnqueued: キューに入っていません
|
78
78
|
CreatedAt: 作成日時
|
79
|
+
BackToApp: アプリに戻る
|
80
|
+
Latency: レイテンシ
|
data/web/locales/ur.yml
ADDED
@@ -0,0 +1,80 @@
|
|
1
|
+
# elements like %{queue} are variables and should not be translated
|
2
|
+
ur:
|
3
|
+
TextDirection: 'rtl'
|
4
|
+
Dashboard: صفحۂ اول
|
5
|
+
Status: اسٹیٹس
|
6
|
+
Time: ﻭﻗﺖ
|
7
|
+
Namespace: Namespace
|
8
|
+
Realtime: ﺑﺮاﮦ ﺭاﺳﺖ
|
9
|
+
History: ﺗﺎﺭﻳﺦ
|
10
|
+
Busy: مصروف
|
11
|
+
Processed: مکمل شدہ
|
12
|
+
Failed: ﻧﺎکاﻡ ﺷﺪﮦ
|
13
|
+
Scheduled: ﻁےﺷﺪﮦ
|
14
|
+
Retries: ﺩﻭﺑﺎﺭﮦ کﻭﺷﻴﺶ
|
15
|
+
Enqueued: قطار ميں شامل
|
16
|
+
Worker: ورکر
|
17
|
+
LivePoll: ﺑﺮاﮦ ﺭاﺳﺖ
|
18
|
+
StopPolling: ﺑﺮاﮦ ﺭاﺳﺖ روکيے
|
19
|
+
Queue: قطار
|
20
|
+
Class: کلاس
|
21
|
+
Job: جاب
|
22
|
+
Arguments: دلائل
|
23
|
+
Extras: اﺻﺎﻑی
|
24
|
+
Started: شروع
|
25
|
+
ShowAll: سارے دکھاو
|
26
|
+
CurrentMessagesInQueue: قطار ميں موجود تمام پيغامات <span class='title'>%{queue}</span>
|
27
|
+
AddToQueue: ﻗﻄﺎﺭ ميں شامل کريں
|
28
|
+
AreYouSureDeleteJob: کيا آپ یقین جاب حتم کرنا چاھتے ہيں ؟
|
29
|
+
AreYouSureDeleteQueue: کيا آپ یقین قطار حتم کرنا چاھتے ہيں ؟
|
30
|
+
Delete: ﺣﺬﻑ
|
31
|
+
Queues: قطاريں
|
32
|
+
Size: ﺣﺠﻢ
|
33
|
+
Actions: ﻋﻮاﻣﻞ
|
34
|
+
NextRetry: اگلی کﻭﺷﻴﺶ
|
35
|
+
RetryCount: دوبارہ کوشش کا مکمل شمار
|
36
|
+
RetryNow: ابھی دوبارہ کوشش
|
37
|
+
Kill: ختم کرديں
|
38
|
+
LastRetry: گزشتہ کوشش
|
39
|
+
OriginallyFailed: ابتادائ ناکامی
|
40
|
+
AreYouSure: کيا یقین ؟
|
41
|
+
DeleteAll: ﺗﻤﺎﻡ ﺣﺬﻑ کر ديں
|
42
|
+
RetryAll: ﺗﻤﺎﻡ کی ﺩﻭﺑﺎﺭﮦ کﻭﺷﻴﺶ کﺭيں
|
43
|
+
NoRetriesFound: کویٔ ﺩﻭﺑﺎﺭﮦ کﻭﺷﻴﺶ نھيں ملی
|
44
|
+
Error: مسئلہ
|
45
|
+
ErrorClass: مسئلہ کی کلاس
|
46
|
+
ErrorMessage: مسئلہ کی وجہ
|
47
|
+
ErrorBacktrace: مسئلہ کی کی تحقیقات کريں
|
48
|
+
GoBack: واپس جايں
|
49
|
+
NoScheduledFound: کویٔ ﻁےﺷﺪﮦچيز نہیں ملی
|
50
|
+
When: ﺏک
|
51
|
+
ScheduledJobs: ﻁےﺷﺪﮦجاب
|
52
|
+
idle: بیکار
|
53
|
+
active: فعال
|
54
|
+
Version: ورژن
|
55
|
+
Connections: کنکشنز
|
56
|
+
MemoryUsage: یاداشت کا استعمال
|
57
|
+
PeakMemoryUsage: سب سے زيادہ یاداشت کا استعمال
|
58
|
+
Uptime: اپ ٹائم
|
59
|
+
OneWeek: ایک ہفتہ
|
60
|
+
OneMonth: ایک مہینہ
|
61
|
+
ThreeMonths: تین ماہ
|
62
|
+
SixMonths: چھ ماہ
|
63
|
+
Failures: ناکامیاں
|
64
|
+
DeadJobs: ختم شدہ جاب
|
65
|
+
NoDeadJobsFound: کویٔ ختم شدہ جاب نہيی ملی
|
66
|
+
Dead: ختم شدہ
|
67
|
+
Processes: ﻋﻤﻠﻴﺎﺕ
|
68
|
+
Thread: موضوع
|
69
|
+
Threads: موضوع
|
70
|
+
Jobs: جابز
|
71
|
+
Paused: موقوف
|
72
|
+
Stop: بند کرو
|
73
|
+
Quiet: ﺣﺘﻢ کﺭﻭ
|
74
|
+
StopAll: ﺗﻤﺎﻡ ﺑﻨﺪ کﺭﻭ
|
75
|
+
QuietAll: ﺗﻤﺎﻡ ﺣﺘﻢ کﺭﻭ
|
76
|
+
PollingInterval: ﺑﺮاﮦ ﺭاﺳﺖ کا ﺩﻭﺭاﻧﻴﮧ
|
77
|
+
Plugins: پلگ انز
|
78
|
+
NotYetEnqueued: ﻗﺘﺎﺭميں شامل نھيں
|
79
|
+
CreatedAt: ﺗﺎﺭﻳﺢ آﻏﺎﺯ
|
80
|
+
BackToApp: ﻭاپﺱ صفحۂ اﻭﻝ پر
|
data/web/views/_footer.erb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
<div class="navbar navbar-fixed-bottom navbar-inverse">
|
1
|
+
<div class="navbar navbar-fixed-bottom navbar-inverse ltr">
|
2
2
|
<div class="navbar-inner">
|
3
3
|
<div class="container text-center">
|
4
4
|
<ul class="nav">
|
@@ -9,7 +9,10 @@
|
|
9
9
|
<p class="navbar-text redis-url" title="<%= redis_connection_and_namespace %>"><%= redis_connection_and_namespace %></p>
|
10
10
|
</li>
|
11
11
|
<li>
|
12
|
-
<p class="navbar-text"><%=
|
12
|
+
<p class="navbar-text server-utc-time"><%= server_utc_time %></p>
|
13
|
+
</li>
|
14
|
+
<li>
|
15
|
+
<p class="navbar-text"><a style="color: gray;" href="https://github.com/mperham/sidekiq/wiki">docs</a></p>
|
13
16
|
</li>
|
14
17
|
</ul>
|
15
18
|
</div>
|
data/web/views/_job_info.erb
CHANGED
data/web/views/_nav.erb
CHANGED
@@ -9,7 +9,7 @@
|
|
9
9
|
<div class="navbar-toggle collapsed navbar-livereload">
|
10
10
|
<%= erb :_poll_link %>
|
11
11
|
<% if Sidekiq::Web.app_url %>
|
12
|
-
<a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"
|
12
|
+
<a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"><%= t('BackToApp') %></a>
|
13
13
|
<% end %>
|
14
14
|
</div>
|
15
15
|
<a class="navbar-brand" href="<%= root_path %>">
|
@@ -32,28 +32,14 @@
|
|
32
32
|
<% end %>
|
33
33
|
<% end %>
|
34
34
|
|
35
|
-
<li class="dropdown" data-navbar="dropdown">
|
36
|
-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
|
37
|
-
<%= t('Plugins') %> <span class="caret"></span>
|
38
|
-
</a>
|
39
|
-
<ul class="dropdown-menu" role="menu">
|
40
|
-
<% Sidekiq::Web.custom_tabs.each do |title, url| %>
|
41
|
-
<li>
|
42
|
-
<a href="<%= root_path %><%= url %>"><%= t(title) %></a>
|
43
|
-
</li>
|
44
|
-
<% end %>
|
45
|
-
</ul>
|
46
|
-
</li>
|
47
|
-
|
48
35
|
<% Sidekiq::Web.custom_tabs.each do |title, url| %>
|
49
36
|
<li class="<%= current_path.start_with?(url) ? 'active' : '' %>" data-navbar="custom-tab">
|
50
37
|
<a href="<%= root_path %><%= url %>"><%= t(title) %></a>
|
51
38
|
</li>
|
52
39
|
<% end %>
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
<div class="poll-wrapper pull-right">
|
40
|
+
|
41
|
+
<li class="navbar-livereload">
|
42
|
+
<div class="poll-wrapper">
|
57
43
|
<%= erb :_poll_link %>
|
58
44
|
<% if Sidekiq::Web.app_url %>
|
59
45
|
<a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"><%= t('BackToApp') %></a>
|
data/web/views/_paging.erb
CHANGED
data/web/views/busy.erb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
<div class="row header">
|
2
|
-
<div class="col-sm-8 pull-left">
|
2
|
+
<div class="col-sm-8 pull-left flip">
|
3
3
|
<h3><%= t('Processes') %></h3>
|
4
4
|
</div>
|
5
|
-
<div class="col-sm-4 pull-right">
|
5
|
+
<div class="col-sm-4 pull-right flip">
|
6
6
|
<form method="POST" class="warning-messages">
|
7
7
|
<%= csrf_tag %>
|
8
|
-
<div class="btn-group pull-right">
|
8
|
+
<div class="btn-group pull-right flip">
|
9
9
|
<button class="btn btn-warn" type="submit" name="quiet" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('QuietAll') %></button>
|
10
10
|
<button class="btn btn-danger" type="submit" name="stop" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('StopAll') %></button>
|
11
11
|
</div>
|
@@ -22,6 +22,7 @@
|
|
22
22
|
<th><%= t('Busy') %></th>
|
23
23
|
<th> </th>
|
24
24
|
</thead>
|
25
|
+
<% lead = processes.leader %>
|
25
26
|
<% processes.each do |process| %>
|
26
27
|
<tr>
|
27
28
|
<td class="box">
|
@@ -31,7 +32,10 @@
|
|
31
32
|
<span class="label label-info"><%= label %></span>
|
32
33
|
<% end %>
|
33
34
|
<% if process.stopping? %>
|
34
|
-
<span class="label label-danger">
|
35
|
+
<span class="label label-danger">quiet</span>
|
36
|
+
<% end %>
|
37
|
+
<% if process.identity == lead %>
|
38
|
+
<span class="label label-warning">leader</span>
|
35
39
|
<% end %>
|
36
40
|
<br>
|
37
41
|
<b><%= "#{t('Queues')}: " %></b>
|
@@ -41,7 +45,7 @@
|
|
41
45
|
<td><%= process['concurrency'] %></td>
|
42
46
|
<td><%= process['busy'] %></td>
|
43
47
|
<td>
|
44
|
-
<div class="btn-group pull-right">
|
48
|
+
<div class="btn-group pull-right flip">
|
45
49
|
<form method="POST">
|
46
50
|
<%= csrf_tag %>
|
47
51
|
<input type="hidden" name="identity" value="<%= process['identity'] %>"/>
|
data/web/views/dashboard.erb
CHANGED
@@ -7,11 +7,11 @@
|
|
7
7
|
<span class="dot"></span>
|
8
8
|
</span>
|
9
9
|
</h3>
|
10
|
-
<div class="interval-slider">
|
10
|
+
<div class="interval-slider ltr">
|
11
11
|
<span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
|
12
|
-
<span class="current-interval">
|
12
|
+
<span class="current-interval">5 sec</span>
|
13
13
|
<br/>
|
14
|
-
<input type="range" min="2000" max="20000" step="1000" value="
|
14
|
+
<input type="range" min="2000" max="20000" step="1000" value="5000"/>
|
15
15
|
</div>
|
16
16
|
</div>
|
17
17
|
|
data/web/views/layout.erb
CHANGED
@@ -1,11 +1,20 @@
|
|
1
1
|
<!doctype html>
|
2
|
-
<html>
|
2
|
+
<html dir="<%= text_direction %>">
|
3
3
|
<head>
|
4
4
|
<title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
|
5
|
-
<meta charset="
|
5
|
+
<meta charset="utf-8" />
|
6
6
|
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
|
7
|
+
|
7
8
|
<link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
|
9
|
+
<% if rtl? %>
|
10
|
+
<link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css"/>
|
11
|
+
<% end %>
|
12
|
+
|
8
13
|
<link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
|
14
|
+
<% if rtl? %>
|
15
|
+
<link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
|
16
|
+
<% end %>
|
17
|
+
|
9
18
|
<link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
|
10
19
|
<script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
|
11
20
|
<meta name="google" content="notranslate" />
|
data/web/views/morgue.erb
CHANGED
@@ -47,24 +47,28 @@
|
|
47
47
|
<div class="args"><%= display_args(entry.display_args) %></div>
|
48
48
|
</td>
|
49
49
|
<td>
|
50
|
+
<% if entry.error? %>
|
50
51
|
<div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
|
52
|
+
<% end %>
|
51
53
|
</td>
|
52
54
|
</tr>
|
53
55
|
<% end %>
|
54
56
|
</table>
|
55
57
|
</div>
|
56
|
-
<input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
57
|
-
<input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
|
58
|
+
<input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
59
|
+
<input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
|
58
60
|
</form>
|
59
61
|
|
60
|
-
|
61
|
-
<%=
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
<%=
|
66
|
-
|
67
|
-
|
62
|
+
<% unfiltered? do %>
|
63
|
+
<form action="<%= root_path %>morgue/all/delete" method="post">
|
64
|
+
<%= csrf_tag %>
|
65
|
+
<input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
66
|
+
</form>
|
67
|
+
<form action="<%= root_path %>morgue/all/retry" method="post">
|
68
|
+
<%= csrf_tag %>
|
69
|
+
<input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
70
|
+
</form>
|
71
|
+
<% end %>
|
68
72
|
|
69
73
|
<% else %>
|
70
74
|
<div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>
|
data/web/views/queue.erb
CHANGED
@@ -5,10 +5,11 @@
|
|
5
5
|
<% if @queue.paused? %>
|
6
6
|
<span class="label label-danger"><%= t('Paused') %></span>
|
7
7
|
<% end %>
|
8
|
+
<span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
|
8
9
|
</h3>
|
9
10
|
</div>
|
10
|
-
<div class="col-sm-4 pull-right">
|
11
|
-
<%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
|
11
|
+
<div class="col-sm-4 pull-right flip">
|
12
|
+
<%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
|
12
13
|
</div>
|
13
14
|
</header>
|
14
15
|
<div class="table_container">
|
@@ -22,19 +23,19 @@
|
|
22
23
|
<tr>
|
23
24
|
<td><%= h(msg.display_class) %></td>
|
24
25
|
<td>
|
25
|
-
<% a = msg.display_args
|
26
|
-
<% if a.size > 100 %>
|
27
|
-
<%= h(
|
28
|
-
<button data-toggle="collapse" data-target="
|
29
|
-
<div class="toggle
|
26
|
+
<% a = msg.display_args %>
|
27
|
+
<% if a.inspect.size > 100 %>
|
28
|
+
<span class="worker_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
|
29
|
+
<button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
|
30
|
+
<div class="toggle worker_<%= index %>"><%= display_args(a) %></div>
|
30
31
|
<% else %>
|
31
|
-
<%=
|
32
|
+
<%= display_args(msg.display_args) %>
|
32
33
|
<% end %>
|
33
34
|
</td>
|
34
35
|
<td>
|
35
|
-
<form action="<%= root_path %>queues/<%= @name %>/delete" method="post">
|
36
|
+
<form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
|
36
37
|
<%= csrf_tag %>
|
37
|
-
<input name="key_val" value="<%= h
|
38
|
+
<input name="key_val" value="<%= h msg.value %>" type="hidden" />
|
38
39
|
<input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
|
39
40
|
</form>
|
40
41
|
</td>
|
data/web/views/queues.erb
CHANGED
@@ -5,19 +5,21 @@
|
|
5
5
|
<thead>
|
6
6
|
<th><%= t('Queue') %></th>
|
7
7
|
<th><%= t('Size') %></th>
|
8
|
+
<th><%= t('Latency') %></th>
|
8
9
|
<th><%= t('Actions') %></th>
|
9
10
|
</thead>
|
10
11
|
<% @queues.each do |queue| %>
|
11
12
|
<tr>
|
12
13
|
<td>
|
13
|
-
<a href="<%= root_path %>queues/<%= queue.name %>"><%= queue.name %></a>
|
14
|
+
<a href="<%= root_path %>queues/<%= CGI.escape(queue.name) %>"><%= h queue.name %></a>
|
14
15
|
<% if queue.paused? %>
|
15
16
|
<span class="label label-danger"><%= t('Paused') %></span>
|
16
17
|
<% end %>
|
17
18
|
</td>
|
18
19
|
<td><%= number_with_delimiter(queue.size) %> </td>
|
20
|
+
<td><% queue_latency = queue.latency %><%= number_with_delimiter(queue_latency.round(2)) %><%= (queue_latency < 60) ? '' : " (#{relative_time(Time.at(Time.now.to_f - queue_latency))})" %> </td>
|
19
21
|
<td class="delete-confirm">
|
20
|
-
<form action="<%=root_path %>queues/<%= queue.name %>" method="post">
|
22
|
+
<form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
|
21
23
|
<%= csrf_tag %>
|
22
24
|
<input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
|
23
25
|
</form>
|
data/web/views/retries.erb
CHANGED
@@ -55,19 +55,25 @@
|
|
55
55
|
<% end %>
|
56
56
|
</table>
|
57
57
|
</div>
|
58
|
-
<input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
59
|
-
<input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
|
60
|
-
<input class="btn btn-danger btn-xs pull-left" type="submit" name="kill" value="<%= t('Kill') %>" />
|
58
|
+
<input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
|
59
|
+
<input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
|
60
|
+
<input class="btn btn-danger btn-xs pull-left flip" type="submit" name="kill" value="<%= t('Kill') %>" />
|
61
61
|
</form>
|
62
62
|
|
63
|
-
|
64
|
-
<%=
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
<%=
|
69
|
-
|
70
|
-
|
63
|
+
<% unfiltered? do %>
|
64
|
+
<form action="<%= root_path %>retries/all/delete" method="post">
|
65
|
+
<%= csrf_tag %>
|
66
|
+
<input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
67
|
+
</form>
|
68
|
+
<form action="<%= root_path %>retries/all/retry" method="post">
|
69
|
+
<%= csrf_tag %>
|
70
|
+
<input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
71
|
+
</form>
|
72
|
+
<form action="<%= root_path %>retries/all/kill" method="post">
|
73
|
+
<%= csrf_tag %>
|
74
|
+
<input class="btn btn-danger btn-xs pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
|
75
|
+
</form>
|
76
|
+
<% end %>
|
71
77
|
|
72
78
|
<% else %>
|
73
79
|
<div class="alert alert-success"><%= t('NoRetriesFound') %></div>
|
data/web/views/retry.erb
CHANGED
data/web/views/scheduled.erb
CHANGED
@@ -46,8 +46,8 @@
|
|
46
46
|
<% end %>
|
47
47
|
</table>
|
48
48
|
</div>
|
49
|
-
<input class="btn btn-danger pull-right" type="submit" name="delete" value="<%= t('Delete') %>" />
|
50
|
-
<input class="btn btn-danger pull-right" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
|
49
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('Delete') %>" />
|
50
|
+
<input class="btn btn-danger pull-right flip" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
|
51
51
|
</form>
|
52
52
|
<% else %>
|
53
53
|
<div class="alert alert-success"><%= t('NoScheduledFound') %></div>
|