[freeside-commits] freeside/FS/FS/part_export cpanel.pm,1.2,1.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail:/tmp/cvs-serv3119

Modified Files:
	cpanel.pm 
Log Message:
add debugging to cpanel export

Index: cpanel.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/cpanel.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cpanel.pm	7 Sep 2005 10:16:25 -0000	1.2
+++ cpanel.pm	12 Oct 2005 08:57:54 -0000	1.3
@@ -9,6 +9,7 @@
 tie my %options, 'Tie::IxHash',
   'user'       => { label=>'Remote access username' },
   'accesshash' => { label=>'Remote access key', type=>'textarea' },
+  'debug'      => { label=>'Enable debugging', type=>'checkbox' },
 ;
 
 %info = (
@@ -82,44 +83,68 @@
     $self->machine,
     $self->option('user'),
     $self->option('accesshash'),
+    $self->option('debug'),
     @_ 
   ) or $queue;
 }
 
 
 sub cpanel_insert { #subroutine, not method
-  my $whm = cpanel_connect(shift, shift, shift);
+  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
+  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
+  warn "  cpanel->createacct ". join(', ', @_). "\n"
+    if $debug;
   my $response = $whm->createacct(@_);
   die $whm->{'error'} if $whm->{'error'};
+  warn "  cpanel response: $response\n"
+    if $debug;
 }
 
 #sub cpanel_replace { #subroutine, not method
 #}
 
 sub cpanel_delete { #subroutine, not method
-  my $whm = cpanel_connect(shift, shift, shift);
+  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
+  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
+  warn "  cpanel->killacct ". join(', ', @_). "\n"
+    if $debug;
   my $response = $whm->killacct(shift);
   die $whm->{'error'} if $whm->{'error'};
+  warn "  cpanel response: $response\n"
+    if $debug;
 }
 
 sub cpanel_suspend { #subroutine, not method
-  my $whm = cpanel_connect(shift, shift, shift);
+  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
+  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
+  warn "  cpanel->suspend ". join(', ', @_). "\n"
+    if $debug;
   my $response = $whm->suspend(shift);
   die $whm->{'error'} if $whm->{'error'};
+  warn "  cpanel response: $response\n"
+    if $debug;
 }
 
 sub cpanel_unsuspend { #subroutine, not method
-  my $whm = cpanel_connect(shift, shift, shift);
+  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
+  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
+  warn "  cpanel->unsuspend ". join(', ', @_). "\n"
+    if $debug;
   my $response = $whm->unsuspend(shift);
   die $whm->{'error'} if $whm->{'error'};
+  warn "  cpanel response: $response\n"
+    if $debug;
 }
 
 sub cpanel_connect {
-  my( $host, $user, $accesshash ) = @_;
+  my( $host, $user, $accesshash, $debug ) = @_;
 
   eval "use Cpanel::Accounting;";
   die $@ if $@;
 
+  warn "creating new Cpanel::Accounting connection to $user@$host\n"
+    if $debug;
+
   my $whm = new Cpanel::Accounting;
   $whm->{'host'}       = $host;
   $whm->{'user'}       = $user;