diff options
| author | Byron Jones <glob@mozilla.com> | 2014-11-04 07:53:12 +0100 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2014-11-04 07:53:12 +0100 |
| commit | 7fdcd8ef2760a536190c44e1318e4342d27ec619 (patch) | |
| tree | c340a019a23d6072aa47b2eceff5c503c7d6a86f | |
| parent | 32e6ac30461863f4fc89a050455794436affa2a3 (diff) | |
| download | bugzilla-7fdcd8ef2760a536190c44e1318e4342d27ec619.tar.gz bugzilla-7fdcd8ef2760a536190c44e1318e4342d27ec619.tar.xz | |
Bug 1092037: backport bug 1062739 to bmo (add the ability for administrators to limit the number of emails sent to a user per minute and hour)
| -rw-r--r-- | Bugzilla/Job/Mailer.pm | 2 | ||||
| -rwxr-xr-x | view_job_queue.cgi | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Bugzilla/Job/Mailer.pm b/Bugzilla/Job/Mailer.pm index e3b94894a..56b6d4f69 100644 --- a/Bugzilla/Job/Mailer.pm +++ b/Bugzilla/Job/Mailer.pm @@ -63,7 +63,7 @@ sub work { sub process_job { my ($class, $arg) = @_; - MessageToMTA($arg, 1); + MessageToMTA($arg->{msg}, 1); } 1; diff --git a/view_job_queue.cgi b/view_job_queue.cgi index 7accc512d..5ebe1e7a5 100755 --- a/view_job_queue.cgi +++ b/view_job_queue.cgi @@ -45,6 +45,7 @@ sub generate_report { j.run_after AS run_time, j.grabbed_until, f.funcname AS func, + (SELECT COUNT(*) FROM ts_error WHERE e.jobid = j.jobid) AS error_count, e.jobid AS error_count, e.error_time AS error_time, e.message AS error_message |