X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCron%2Fcheck.pm;h=75247fbaf4213cd54eb566bfe2a20a09b4b5e69a;hb=85e677b86fc37c54e6de2b06340351a28f5a5916;hp=f38cb5f6b66c68b211643cd34c5b84675d805636;hpb=6b89c9cf7abe900811cac333fa7133f1be0af488;p=freeside.git

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index f38cb5f6b..75247fbaf 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -6,6 +6,8 @@ use vars qw( @ISA @EXPORT_OK $DEBUG $FS_RUN $error_msg
            );
 use Exporter;
 use LWP::UserAgent;
+use HTTP::Request;
+use URI::Escape;
 use Email::Send;
 use FS::Conf;
 use FS::Record qw(qsearch);
@@ -14,7 +16,6 @@ use FS::cust_pay_pending;
 @ISA = qw( Exporter );
 @EXPORT_OK = qw(
   check_queued check_selfservice check_apache check_bop_failures
-  check_sg check_sgng
   alert error_msg
 );
 
@@ -46,56 +47,6 @@ sub check_selfservice {
   return 1;
 }
 
-sub check_sg {
-  my $conf = new FS::Conf;
-  #different trigger if they ever stop using multicustomer_hack ?
-  return 1 unless $conf->exists('sg-multicustomer_hack');
-
-  my $ua = new LWP::UserAgent;
-  $ua->agent("FreesideCronCheck/0.1 " . $ua->agent);
-
-  my $USER = $conf->config('sg-ping_username');
-  my $PASS = $conf->config('sg-ping_password');
-  my $req = new HTTP::Request GET=>"https://$USER:$PASS\@localhost/sg/ping.cgi";
-  my $res = $ua->request($req);
-
-  return 1 if $res->is_success
-           && $res->content =~ /OK/
-           && $res->content !~ /error/i; #doh, the error message includes "OK"
-
-  $error_msg = $res->is_success ? $res->content : $res->status_line;
-  return 0;
-
-}
-
-sub check_sgng {
-  my $conf = new FS::Conf;
-  #different trigger if they ever stop using multicustomer_hack ?
-  return 1 unless $conf->exists('sg-multicustomer_hack');
-
-  eval 'use RPC::XML; use RPC::XML::Client;';
-  if ($@) { $error_msg = $@; return 0; };
-
-  my $cli = RPC::XML::Client->new('https://localhost/selfservice/xmlrpc.cgi');
-  my $resp = $cli->send_request('FS.SelfService.XMLRPC.ping');
-
-  return 1 if ref($resp)
-           && ! $resp->is_fault
-           && ref($resp->value)
-           && $resp->value->{'pong'} == 1;
-
-  #hua
-  $error_msg = ref($resp)
-                 ? ( $resp->is_fault
-                       ? $resp->string
-                       : ( ref($resp->value) ? $resp->value->{'error'}
-                                             : $resp->value
-                         )
-                 )
-                 : $resp;
-  return 0;
-}
-
 sub _check_fsproc {
   my $arg = shift;
   _check_pidfile( "freeside-$arg.pid" );
@@ -124,7 +75,7 @@ sub check_apache {
 }
 
 #and now for something entirely different...
-my $num_consecutive_bop_failures = 50;
+my $num_consecutive_bop_failures = 60;
 sub check_bop_failures {
 
   return 1 if grep { $_->statustext eq 'captured' }