X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Ftextradius.pm;h=1492f267296a60ecc96fa188469c51c53671613d;hp=de0158b5080375074927290614eba27c520127be;hb=d5ae9f38bdea9e3de50f76aa8caf06956b4fb706;hpb=3b7715909d2f2983a077ff97ff66faac40cb9558 diff --git a/FS/FS/part_export/textradius.pm b/FS/FS/part_export/textradius.pm index de0158b50..1492f2672 100644 --- a/FS/FS/part_export/textradius.pm +++ b/FS/FS/part_export/textradius.pm @@ -43,7 +43,7 @@ sub textradius_queue { 'job' => "FS::part_export::textradius::textradius_$method", }; $queue->insert( - $self->option('user'), + $self->option('user')||'root', $self->machine, $self->option('users'), @_, @@ -126,7 +126,13 @@ sub textradius_download { $rsync->exec( { src => "$user\@$host:$users", dest => $dest, - } ); + } ); # true/false return value from exec is not working, alas + if ( $rsync->err ) { + die "error downloading $user\@$host:$users : ". + 'exit status: '. $rsync->status. ', '. + 'STDERR: '. join(" / ", $rsync->err). ', '. + 'STDOUT: '. join(" / ", $rsync->out); + } $dest; } @@ -145,7 +151,13 @@ sub textradius_upload { $rsync->exec( { src => "$dir/users", dest => "$user\@$host:$users", - } ); + } ); # true/false return value from exec is not working, alas + if ( $rsync->err ) { + die "error uploading to $user\@$host:$users : ". + 'exit status: '. $rsync->status. ', '. + 'STDERR: '. join(" / ", $rsync->err). ', '. + 'STDOUT: '. join(" / ", $rsync->out); + } flock(LOCK,LOCK_UN); close LOCK;