import torrus 1.0.9

[freeside.git] / FS / FS / part_export / domreg_opensrs.pm

diff --git a/FS/FS/part_export/domreg_opensrs.pm b/FS/FS/part_export/domreg_opensrs.pm
index 4d6ea8f..76f0059 100644 (file)
--- a/FS/FS/part_export/domreg_opensrs.pm
+++ b/FS/FS/part_export/domreg_opensrs.pm
@@ -259,8 +259,6 @@ sub _export_insert_on_payment {
     'job'    => 'FS::part_export::domreg_opensrs::renew_through',
   };
   $queue->insert( $self, $svc_domain ); #_export_insert with 'R' action?
-
-  return '';
 }
 
 ## Domain registration exports do nothing on replace.  Mainly because we haven't decided what they should do.
@@ -381,6 +379,8 @@ Like most export functions, returns an error message on failure or undef on succ
 sub register {
   my ( $self, $svc_domain, $years ) = @_;
 
+  $years = 1 unless $years; #default to 1 year since we don't seem to pass it
+
   return "Net::OpenSRS does not support period other than 1 year" if $years != 1;
 
   eval "use Net::OpenSRS;";
@@ -482,7 +482,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
 
-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
 
@@ -491,24 +492,24 @@ sub renew_through {
 
   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;
-    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 );
-  return $err if $err;
+  die $err if $err;
 
   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};
 
-  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);
@@ -531,11 +532,13 @@ sub renew_through {
     $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
   }
 
-  warn "$me: renewing ". $svc_domain->domain. "for $years years\n" if $DEBUG;
+  return '' unless $years;
+
+  warn "$me: renewing ". $svc_domain->domain. " for $years years\n" if $DEBUG;
   my $srs = $self->get_srs;
   $rv = $srs->make_request(
     {
@@ -550,7 +553,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
 }