Bug 1092037: backport bug 1062739 to bmo (add the ability for adminis…

…trators to limit the number of emails sent to a user per minute and hour)
mozilla-bteam · Nov 4, 2014 · 7fdcd8e · 7fdcd8e
1 parent 32e6ac3
commit 7fdcd8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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