summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2009-09-28 22:35:35 +0000
committerivan <ivan>2009-09-28 22:35:35 +0000
commit6bef62b1c736c51225505143e0f02e6e93aef768 (patch)
treea487edaa398a90da4106a459edd09f1c3392f4cc
parentc658c668af2f141eabaa0b665ff19d1dd7b0c833 (diff)
correct place for use Email::Send, RT#4610
-rw-r--r--FS/FS/Cron/check.pm1
-rw-r--r--FS/bin/freeside-check6
2 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index 1474c2ca8..a7903cec4 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -6,6 +6,7 @@ use vars qw( @ISA @EXPORT_OK $DEBUG $FS_RUN $error_msg
);
use Exporter;
use LWP::UserAgent;
+use Email::Send;
use FS::Conf;
use FS::Record qw(qsearch);
use FS::cust_pay_pending;
diff --git a/FS/bin/freeside-check b/FS/bin/freeside-check
index ac2fc3d03..9c9da7646 100644
--- a/FS/bin/freeside-check
+++ b/FS/bin/freeside-check
@@ -2,7 +2,6 @@
#!/usr/bin/perl -w
use strict;
-use Email::Send;
use FS::UID qw( adminsuidsetup );
use FS::Cron::check qw(
check_queued check_selfservice check_apache check_bop_failures
@@ -23,8 +22,9 @@ check_selfservice or alert(error_msg(), @emails);
check_apache or alert('Apache not running: '. error_msg(), @emails);
#no-ops unless you are sg
-check_sg or alert('FS::ClientAPI::SG not responding', @emails);
-check_sgng or alert('FS::ClientAPI::SGNG not responding', @emails);
+my $sg = 'FS::ClientAPI::SG';
+check_sg or alert("$sg not responding: ". error_msg(), @emails);
+check_sgng or alert("${sg}NG not responding: ". error_msg(), @emails);
check_bop_failures or alert(error_msg(), @emails);