#
use strict;
+use vars qw($pid);
use IO::Handle;
use Storable qw(nstore_fd fd_retrieve);
use Tie::RefHash;
use FS::Record qw( qsearch qsearchs );
use FS::cust_main_county;
use FS::cust_main;
-use FS::msgcat qw(gettext);
+use FS::Msgcat qw(gettext);
use vars qw( $opt $Debug );
#causing trouble for some folks
#$SIG{CHLD} = sub { wait() };
+$SIG{HUP} = \&killssh;
+$SIG{INT} = \&killssh;
+$SIG{QUIT} = \&killssh;
+$SIG{TERM} = \&killssh;
+$SIG{PIPE} = \&killssh;
+sub killssh { kill 'TERM', $pid if $pid; exit; };
+
my($fs_signupd)="/usr/local/sbin/fs_signupd";
while (1) {
my($reader,$writer)=(new IO::Handle, new IO::Handle);
#seems to be broken - calling ->flush explicitly# $writer->autoflush(1);
warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
- sshopen2($machine,$reader,$writer,$fs_signupd);
+ $pid = sshopen2($machine,$reader,$writer,$fs_signupd);
my @pops = qsearch('svc_acct_pop',{} );
my $init_data = {
# common that are still here and library them.
my $cust_main = new FS::cust_main ( {
#'custnum' => '',
- 'agentnum' => $agentnum,
+ 'agentnum' => $signup_data->{agentnum} || $agentnum,
'refnum' => $refnum,
map { $_ => $signup_data->{$_} } qw(
warn "[fs_signup_server] Sending results...\n" if $Debug;
print $writer $error, "\n";
- if ( $conf->config('signup_server-realtime') ) {
-
+ next if $error;
+
+ if ( $conf->exists('signup_server-realtime') ) {
+
+ warn "[fs_signup_server] Billing customer...\n" if $Debug;
+
my $bill_error = $cust_main->bill;
warn "[fs_signup_server] error billing new customer: $bill_error"
if $bill_error;
}
}
- if ( $error && $conf->config('signup_server-email') ) {
+ if ( $conf->config('signup_server-email') ) {
warn "[fs_signup_server] Sending email...\n" if $Debug;
#false laziness w/FS::cust_bill::send & FS::cust_pay::delete
use Mail::Header;
use Mail::Internet;
+ use Date::Format;
my $from = $conf->config('invoice_from'); #??? as good as any
$ENV{MAILADDRESS} = $from;
my $header = new Mail::Header ( [