[freeside-commits] freeside/FS/FS/part_export shellcommands.pm, 1.66, 1.67 shellcommands_withdomain.pm, 1.14, 1.15 status_shellcommands.pm, 1.4, 1.5

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail.420.am:/tmp/cvs-serv19510/FS/FS/part_export

Modified Files:
	shellcommands.pm shellcommands_withdomain.pm 
	status_shellcommands.pm 
Log Message:
more options for error handling in shellcommands export, #16424

Index: shellcommands.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/shellcommands.pm,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -w -d -r1.66 -r1.67
--- shellcommands.pm	12 Feb 2012 01:40:41 -0000	1.66
+++ shellcommands.pm	16 Feb 2012 21:50:27 -0000	1.67
@@ -80,8 +80,12 @@
                              'Radius group mapping to reason (via template user)',
 			    type  => 'textarea',
 			  },
-  'ignore_all_output' => { 
-      label => 'Ignore all output and errors from the command',
+  'fail_on_output' => {
+      label => 'Treat any output from the command as an error',
+      type  => 'checkbox',
+  },
+  'ignore_all_errors' => {
+      label => 'Ignore all errors from the command',
       type  => 'checkbox',
   },
   'ignored_errors' => { label   => 'Regexes of specific errors to ignore, separated by newlines',
@@ -359,14 +363,16 @@
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
-    ignore_all_output => $self->option('ignore_all_output'),
     ignored_errors    => $self->option('ignored_errors') || '',
+    ignore_all_errors => $self->option('ignore_all_errors'),
+    fail_on_output    => $self->option('fail_on_output'),
   );
 
   if($self->option($action . '_no_queue')) {
     # discard return value just like freeside-queued.
     eval { ssh_cmd(@ssh_cmd_args) };
     $error = $@;
+    $error = $error->full_message if ref $error; # Exception::Class::Base
     return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
       if $error;
   }
@@ -454,14 +460,16 @@
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
-    ignore_all_output => $self->option('ignore_all_output'),
     ignored_errors => $self->option('ignored_errors') || '',
+    ignore_all_errors => $self->option('ignore_all_errors'),
+    fail_on_output    => $self->option('fail_on_output'),
   );
 
   if($self->option('usermod_no_queue')) {
     # discard return value just like freeside-queued.
     eval { ssh_cmd(@ssh_cmd_args) };
     $error = $@;
+    $error = $error->full_message if ref $error; # Exception::Class::Base
     return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
       if $error;
   }
@@ -488,14 +496,17 @@
     $opt->{'user'}.'@'.$opt->{'host'},
     'default_stdin_fh' => $def_in
   );
-  # ignore_all_output doesn't override this
+  # ignore_all_errors doesn't override SSH connection/auth errors--
+  # probably correct
   die "Couldn't establish SSH connection: ". $ssh->error if $ssh->error;
 
   my $ssh_opt = {};
   $ssh_opt->{'stdin_data'} = $opt->{'stdin_string'}
     if exists($opt->{'stdin_string'}) and length($opt->{'stdin_string'});
+
   my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'});
-  return if $opt->{'ignore_all_output'};
+
+  return if $opt->{'ignore_all_errors'};
   die "Error running SSH command: ". $ssh->error if $ssh->error;
 
   if ( ($output || $errput)
@@ -510,8 +521,8 @@
     $errput =~ s/[\s\n]//g;
   }
 
-  die $errput if $errput;
-  die $output if $output;
+  die "$errput\n" if $errput;
+  die "$output\n" if $output and $opt->{'fail_on_output'};
   '';
 }
 
@@ -522,5 +533,23 @@
 #sub shellcommands_delete { #subroutine, not method
 #}
 
+sub _upgrade_exporttype {
+  my $class = shift;
+  $class =~ /^FS::part_export::(\w+)$/;
+  foreach my $self ( qsearch('part_export', { 'exporttype' => $1 }) ) {
+    my %options = $self->options;
+    my $changed = 0;
+    # 2011-12-13 - 2012-02-16: ignore_all_output option
+    if ( $options{'ignore_all_output'} ) {
+      # ignoring STDOUT is now the default
+      $options{'ignore_all_errors'} = 1;
+      delete $options{'ignore_all_output'};
+      $changed++;
+    }
+    my $error = $self->replace(%options) if $changed;
+    die $error if $error;
+  }
+}
+
 1;
 

Index: status_shellcommands.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/status_shellcommands.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- status_shellcommands.pm	9 Feb 2012 10:48:47 -0000	1.4
+++ status_shellcommands.pm	16 Feb 2012 21:50:27 -0000	1.5
@@ -13,8 +13,12 @@
   'spam_tag2_level'  => { label=>'Spam set tag2 level command', },
   'spam_kill_level' => { label=>'Spam set kill level command', },
 
-  'ignore_all_output' => {
-    label => 'Ignore all output and errors from the command',
+  'fail_on_output' => {
+      label => 'Treat any output from the command as an error',
+      type  => 'checkbox',
+  },
+  'ignore_all_errors' => {
+      label => 'Ignore all errors from the command',
     type  => 'checkbox',
   },
 ;
@@ -44,7 +48,8 @@
     user          => $self->option('user') || 'root',
     host          => $self->machine,
     #stdin_string  => $stdin_string,
-    ignore_all_output => $self->option('ignore_all_output'),
+    fail_on_output    => $self->option('fail_on_output'),
+    ignore_all_errors => $self->option('ignore_all_errors'),
     #ignored_errors    => $self->option('ignored_errors') || '',
   );
 

Index: shellcommands_withdomain.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/shellcommands_withdomain.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -d -r1.14 -r1.15
--- shellcommands_withdomain.pm	13 Dec 2011 21:15:48 -0000	1.14
+++ shellcommands_withdomain.pm	16 Feb 2012 21:50:27 -0000	1.15
@@ -66,10 +66,17 @@
                type=>'select', options=>[qw(crypt md5)],
                default => 'crypt',
              },
-  'ignore_all_output' => {
-    label => 'Ignore all output and errors from the command',
+  'fail_on_output' => {
+      label => 'Treat any output from the command as an error',
     type  => 'checkbox',
   },
+  'ignore_all_errors' => {
+      label => 'Ignore all errors from the command',
+      type  => 'checkbox',
+  },
+  'ignored_errors' => { label   => 'Regexes of specific errors to ignore, separated by newlines',
+                        type    => 'textarea'
+                      },
 ;
 
 %info = (