projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
49129c9
)
place errors where users can find them (in the queue)
author
jeff
<jeff>
Mon, 5 Jul 2010 20:18:31 +0000
(20:18 +0000)
committer
jeff
<jeff>
Mon, 5 Jul 2010 20:18:31 +0000
(20:18 +0000)
FS/FS/part_export/domreg_opensrs.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/domreg_opensrs.pm
b/FS/FS/part_export/domreg_opensrs.pm
index
6bb768d
..
6554991
100644
(file)
--- a/
FS/FS/part_export/domreg_opensrs.pm
+++ b/
FS/FS/part_export/domreg_opensrs.pm
@@
-480,7
+480,8
@@
sub renew {
Attempts to renew the domain through the specified date. If no date is
provided it is gleaned from the associated cust_pkg bill date
Attempts to renew the domain through the specified date. If no date is
provided it is gleaned from the associated cust_pkg bill date
-Like most export functions, returns an error message on failure or undef on success.
+Like some export functions, dies on failure or returns undef on success.
+It is always called from the queue.
=cut
=cut
@@
-489,24
+490,24
@@
sub renew_through {
warn "$me: renew_through called\n" if $DEBUG;
eval "use Net::OpenSRS;";
warn "$me: renew_through called\n" if $DEBUG;
eval "use Net::OpenSRS;";
-
return
$@ if $@;
+
die
$@ if $@;
unless ( $date ) {
my $cust_pkg = $svc_domain->cust_svc->cust_pkg;
unless ( $date ) {
my $cust_pkg = $svc_domain->cust_svc->cust_pkg;
-
return
"Can't renew: no date specified and domain is not in a package."
+
die
"Can't renew: no date specified and domain is not in a package."
unless $cust_pkg;
$date = $cust_pkg->bill;
}
my $err = $self->is_supported_domain( $svc_domain );
unless $cust_pkg;
$date = $cust_pkg->bill;
}
my $err = $self->is_supported_domain( $svc_domain );
-
return
$err if $err;
+
die
$err if $err;
warn "$me: checking status\n" if $DEBUG;
my $rv = $self->get_status($svc_domain);
warn "$me: checking status\n" if $DEBUG;
my $rv = $self->get_status($svc_domain);
-
return
"Domain ". $svc_domain->domain. " is not renewable"
+
die
"Domain ". $svc_domain->domain. " is not renewable"
unless $rv->{expdate};
unless $rv->{expdate};
-
return
"Can't parse expiration date for ". $svc_domain->domain
+
die
"Can't parse expiration date for ". $svc_domain->domain
unless $rv->{expdate} =~ /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})/;
my ($year,$month,$day,$hour,$minute,$second) = ($1,$2,$3,$4,$5,$6);
unless $rv->{expdate} =~ /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})/;
my ($year,$month,$day,$hour,$minute,$second) = ($1,$2,$3,$4,$5,$6);
@@
-529,7
+530,7
@@
sub renew_through {
$years++;
$exp->add( 'years' => 1 );
$years++;
$exp->add( 'years' => 1 );
-
return
"Can't renew ". $svc_domain->domain. " for more than 10 years."
+
die
"Can't renew ". $svc_domain->domain. " for more than 10 years."
if $years > 10; #no infinite loop
}
if $years > 10; #no infinite loop
}
@@
-550,7
+551,7
@@
sub renew_through {
}
}
);
}
}
);
-
return
$rv->{response_text} unless $rv->{is_success};
+
die
$rv->{response_text} unless $rv->{is_success};
return ''; # Should only get here if renewal succeeded
}
return ''; # Should only get here if renewal succeeded
}