From 754b8f34127236a75b58ffa8cc09c82fa0980c3f Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Fri, 3 Mar 2017 08:26:31 -0800 Subject: [PATCH 1/7] 1.5.2 --- Ent-Changes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Ent-Changes.md b/Ent-Changes.md index e9f293c8..d7eb0556 100644 --- a/Ent-Changes.md +++ b/Ent-Changes.md @@ -3,9 +3,10 @@ Sidekiq Enterprise Changelog Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy. -HEAD +1.5.2 ------------- +- Fix encrypted arguments double-encrypted by retry or rate limiting [#3368] - Fix leak in concurrent rate limiter, run this in Rails console to clean up existing data [#3323] ```ruby expiry = 1.month.to_i; Sidekiq::Limiter.redis { |c| c.scan_each(match: "lmtr-cfree-*") { |key| c.expire(key, expiry) } } From c481d1ffd02f2bdb0151a563e778e959734e67eb Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Fri, 3 Mar 2017 09:40:26 -0800 Subject: [PATCH 2/7] 3.4.4 --- Pro-Changes.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Pro-Changes.md b/Pro-Changes.md index 131bed3c..505aeffc 100644 --- a/Pro-Changes.md +++ b/Pro-Changes.md @@ -3,6 +3,11 @@ Sidekiq Pro Changelog Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy. +3.4.4 +--------- + +- Optimize super\_fetch shutdown to restart jobs quicker [#3249] + 3.4.3 --------- From 136b5a03e2b11e820763d38d9964430798bd90b1 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Tue, 7 Mar 2017 14:12:12 -0800 Subject: [PATCH 3/7] 3.4.5 --- Pro-Changes.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Pro-Changes.md b/Pro-Changes.md index 505aeffc..53bcb4b2 100644 --- a/Pro-Changes.md +++ b/Pro-Changes.md @@ -3,6 +3,12 @@ Sidekiq Pro Changelog Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy. +3.4.5 +--------- + +- Fix potential job loss with reliable scheduler when lots of jobs are scheduled + at precisely the same time. [#3371] + 3.4.4 --------- From da54d220af7e45a59fcb367852b33fb6096764fe Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Tue, 7 Mar 2017 14:13:40 -0800 Subject: [PATCH 4/7] credit --- Pro-Changes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Pro-Changes.md b/Pro-Changes.md index 53bcb4b2..80eb1edf 100644 --- a/Pro-Changes.md +++ b/Pro-Changes.md @@ -7,7 +7,8 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t --------- - Fix potential job loss with reliable scheduler when lots of jobs are scheduled - at precisely the same time. [#3371] + at precisely the same time. Thanks to raivil for his hard work in + reproducing the bug. [#3371] 3.4.4 --------- From c70e313a804ad222af9b576bc33e252c911b031a Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Wed, 8 Mar 2017 14:46:21 -0800 Subject: [PATCH 5/7] Change default dashboard poll to 5 sec, fixes #3376 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sidekiq 4.0 changed the heartbeat to update statistics only every five seconds so there’s little point to polling more frequently. --- web/assets/javascripts/dashboard.js | 2 +- web/views/dashboard.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/assets/javascripts/dashboard.js b/web/assets/javascripts/dashboard.js index cb297cda..4ffd962f 100644 --- a/web/assets/javascripts/dashboard.js +++ b/web/assets/javascripts/dashboard.js @@ -20,7 +20,7 @@ factory.defined&&factory.defined(function(d){return d.y!==null});return factory} var poller; var realtimeGraph = function(updatePath) { - var timeInterval = parseInt(localStorage.timeInterval || '2000'); + var timeInterval = parseInt(localStorage.timeInterval || '5000'); var graphElement = document.getElementById("realtime"); diff --git a/web/views/dashboard.erb b/web/views/dashboard.erb index 8e3ab142..58e6d0ad 100644 --- a/web/views/dashboard.erb +++ b/web/views/dashboard.erb @@ -9,9 +9,9 @@
<%= t('PollingInterval') %>: - 2 sec + 5 sec
- +
From 116237fcd8dfb0adb9b28792836e055409ec4602 Mon Sep 17 00:00:00 2001 From: mohammad mahmoudi Date: Sat, 11 Mar 2017 00:37:08 +0330 Subject: [PATCH 6/7] Add farsi language to locals file (#3379) --- web/locales/fa.yml | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 web/locales/fa.yml diff --git a/web/locales/fa.yml b/web/locales/fa.yml new file mode 100644 index 00000000..21b4faa0 --- /dev/null +++ b/web/locales/fa.yml @@ -0,0 +1,79 @@ +# elements like %{queue} are variables and should not be translated +en: # <---- change this to your locale code + Dashboard: داشبورد + Status: اعلان + Time: رمان + Namespace: فضای نام + Realtime: زنده + History: تاریخچه + Busy: مشغول + Processed: پردازش شده + Failed: ناموفق + Scheduled: زمان بندی + Retries: تکرار + Enqueued: صف بندی نشدند + Worker: کارگزار + LivePoll: Live Poll + StopPolling: Stop Polling + Queue: صف + Class: کلاس + Job: کار + Arguments: آرگومنت + Extras: اضافی + Started: شروع شده + ShowAll: نمایش همه + CurrentMessagesInQueue: کار فعلی در %{queue} + Delete: حذف + AddToQueue: افزودن به صف + AreYouSureDeleteJob: آیا شما مطمعن هستید از حذف این کار ؟ + AreYouSureDeleteQueue: ایا شما مطمعنید از حذف %{queue} ? + Queues: صف ها + Size: سایز + Actions: اعمال + NextRetry: بار دیگر تلاش کنید + RetryCount: تعداد تلاش ها + RetryNow: تلاش مجدد + Kill: کشتن + LastRetry: آخرین تلاش + OriginallyFailed: Originally Failed + AreYouSure: آیا مطمعن هستید? + DeleteAll: حذف همه + RetryAll: تلاش مجدد برای همه + NoRetriesFound: هیچ تلاش پیدا نشد + Error: خطا + ErrorClass: خطا کلاس + ErrorMessage: پیغام خطا + ErrorBacktrace: خطای معکوس + GoBack: ← برگشت + NoScheduledFound: هیچ کار برنامه ریزی شده ای یافت نشد + When: وقتی که + ScheduledJobs: کار برنامه ریزی شده + idle: بیهودی + active: فعال + Version: ورژن + Connections: ارتباطات + MemoryUsage: حافظه استفاده شده + PeakMemoryUsage: اوج حافظه استفاده شده + Uptime: آپ تایم (روز) + OneWeek: ۱ هفته + OneMonth: ۱ ماه + ThreeMonths: ۳ ماه + SixMonths: ۶ ماه + Failures: شکست ها + DeadJobs: کار مرده + NoDeadJobsFound: کار مرده ای یافت نشد + Dead: مرده + Processes: پردازش ها + Thread: رشته + Threads: رشته ها + Jobs: کار ها + Paused: مکث + Stop: توقف + Quiet: خروج + StopAll: توقف همه + QuietAll: خروج همه + PollingInterval: Polling interval + Plugins: پلاگین ها + NotYetEnqueued: بدون صف بندی + CreatedAt: ساخته شده در + BackToApp: برگشت به برنامه From e6f59f6b40d6ee2ccec6d300729ec69f260e5404 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Fri, 10 Mar 2017 13:07:54 -0800 Subject: [PATCH 7/7] Fix code --- web/locales/fa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/locales/fa.yml b/web/locales/fa.yml index 21b4faa0..1b74f863 100644 --- a/web/locales/fa.yml +++ b/web/locales/fa.yml @@ -1,5 +1,5 @@ # elements like %{queue} are variables and should not be translated -en: # <---- change this to your locale code +fa: # <---- change this to your locale code Dashboard: داشبورد Status: اعلان Time: رمان