summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Config
diff options
context:
space:
mode:
Diffstat (limited to 'Bugzilla/Config')
-rw-r--r--Bugzilla/Config/Common.pm11
-rw-r--r--Bugzilla/Config/MTA.pm8
2 files changed, 17 insertions, 2 deletions
diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index d105d9db8..b6aa1a108 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -49,7 +49,7 @@ use base qw(Exporter);
check_opsys check_shadowdb check_urlbase check_webdotbase
check_netmask check_user_verify_class check_image_converter
check_mail_delivery_method check_notification check_utf8
- check_bug_status check_smtp_auth
+ check_bug_status check_smtp_auth check_theschwartz_available
);
# Checking functions for the various values
@@ -335,6 +335,15 @@ sub check_smtp_auth {
return "";
}
+sub check_theschwartz_available {
+ if (!eval { require TheSchwartz; require Daemon::Generic; }) {
+ return "Using the job queue requires that you have certain Perl"
+ . " modules installed. See the output of checksetup.pl"
+ . " for more information";
+ }
+ return "";
+}
+
# OK, here are the parameter definitions themselves.
#
# Each definition is a hash with keys:
diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index 37d99d967..c7843e286 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -58,6 +58,13 @@ sub get_param_list {
},
{
+ name => 'use_mailer_queue',
+ type => 'b',
+ default => 0,
+ checker => \&check_theschwartz_available,
+ },
+
+ {
name => 'sendmailnow',
type => 'b',
default => 1
@@ -90,7 +97,6 @@ sub get_param_list {
default => 7,
checker => \&check_numeric
},
-
{
name => 'globalwatchers',
type => 't',