summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2008-12-24 04:43:36 +0100
committermkanat%bugzilla.org <>2008-12-24 04:43:36 +0100
commit8a3d4469cc85108a194a78ac95f2a6780d2971eb (patch)
treec89a2d8abb28b792bcdcf04ea76291842dd91d59 /template/en
parent570ca770d29d7800f79d6789c2b1142e383a348a (diff)
downloadbugzilla-8a3d4469cc85108a194a78ac95f2a6780d2971eb.tar.gz
bugzilla-8a3d4469cc85108a194a78ac95f2a6780d2971eb.tar.xz
Bug 284184: Allow Bugzilla to use an asynchronous job queue for sending mail.
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> and Mark Smith <mark@plogs.net> r=glob, a=mkanat
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/params/mta.html.tmpl10
-rw-r--r--template/en/default/global/code-error.html.tmpl15
-rw-r--r--template/en/default/global/messages.html.tmpl3
3 files changed, 28 insertions, 0 deletions
diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
index 800fbad9b..8533257f4 100644
--- a/template/en/default/admin/params/mta.html.tmpl
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -45,6 +45,16 @@
mailfrom => "The email address of the $terms.Bugzilla mail daemon. Some email systems " _
"require this to be a valid email address.",
+ use_mailer_queue => "In a large $terms.Bugzilla installation, updating"
+ _ " $terms.bugs can be very slow, because $terms.Bugzilla sends all"
+ _ " email at once. If you enable this parameter, $terms.Bugzilla will"
+ _ " queue all mail and then send it in the background. This requires"
+ _ " that you have installed certain Perl modules (as listed by"
+ _ " <code>checksetup.pl</code> for this feature), and that you are"
+ _ " running the <code>jobqueue.pl</code> daemon (otherwise your mail"
+ _ " won't get sent). This affects all mail sent by $terms.Bugzilla,"
+ _ " not just $terms.bug updates.",
+
sendmailnow => "Sites using anything older than version 8.12 of 'sendmail' " _
"can achieve a significant performance increase in the " _
"UI -- at the cost of delaying the sending of mail -- by " _
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index f85375849..37e052f81 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -277,6 +277,21 @@
given.
[% END %]
+ [% ELSIF error == "jobqueue_insert_failed" %]
+ [% title = "Job Queue Failure" %]
+ Inserting a <code>[% job FILTER html %]</code> job into the Job
+ Queue failed with the following error: [% errmsg FILTER html %]
+
+ [% ELSIF error == "jobqueue_not_configured" %]
+ Using the job queue system requires that certain Perl modules
+ be installed. Run <code>checksetup.pl</code> to see what modules
+ you are missing.
+
+ [% ELSIF error == "jobqueue_no_job_mapping" %]
+ <code>Bugzilla::JobQueue</code> has not been configured to handle
+ the job "[% job FILTER html %]". You need to add this job type
+ to the <code>JOB_MAP</code> constant in <code>Bugzilla::JobQueue</code>.
+
[% ELSIF error == "ldap_bind_failed" %]
Failed to bind to the LDAP server. The error message was:
<code>[% errstr FILTER html %]</code>
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 1a9c7220a..1aa464c8f 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -451,6 +451,9 @@
group.
[% END %]
+ [% ELSIF message_tag == "job_queue_depth" %]
+ [% count FILTER html %] jobs in the queue.
+
[% ELSIF message_tag == "keyword_created" %]
[% title = "New Keyword Created" %]
The keyword <em>[% name FILTER html %]</em> has been created.