X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=20e90913524b6057101d38bdd4ace3807ed8fa30;hb=404f8f0494ab5fd2ff947bf82d085fed52c126c5;hp=6fe4254beeec14538a89e3e262bfa1ba0fd5524b;hpb=56fcdd00d4aa83e7a77196651e865de5edcd0fae;p=freeside.git

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 6fe4254be..20e909135 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -78,9 +78,17 @@ tie my %options, 'Tie::IxHash',
              },
   'groups_susp_reason' => { label =>
                              'Radius group mapping to reason (via template user)',
-			    type  => 'textarea',
-			  },
-  'ignored_errors' => { label   => 'Regexes of errors to ignore, separated by newlines',
+                             type  => 'textarea',
+                          },
+  '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'
                       },
 #  'no_queue' => { label => 'Run command immediately',
@@ -349,18 +357,22 @@ sub _export_command {
   $locale = shell_quote $locale;
 
   my $command_string = eval(qq("$command"));
+
   my @ssh_cmd_args = (
     user          => $self->option('user') || 'root',
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
-    ignored_errors => $self->option('ignored_errors') || '',
-  );
+    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;
   }
@@ -372,6 +384,7 @@ sub _export_command {
 sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
+  return '' if $command =~ /^\s*$/;
   my $stdin = $self->option('usermod_stdin');
   no strict 'vars';
   {
@@ -447,13 +460,16 @@ sub _export_replace {
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
-    ignored_errors => $self->option('ignored_errors') || '',
+    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;
   }
@@ -480,23 +496,33 @@ sub ssh_cmd { #subroutine, not method
     $opt->{'user'}.'@'.$opt->{'host'},
     'default_stdin_fh' => $def_in
   );
+  # 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_errors'};
   die "Error running SSH command: ". $ssh->error if $ssh->error;
 
-  if ($errput && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})) {
+  if ( ($output || $errput)
+       && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})
+  ) {
     my @ignored_errors = split('\n',$opt->{'ignored_errors'});
     foreach my $ignored_error ( @ignored_errors ) {
+        $output =~ s/$ignored_error//g;
         $errput =~ s/$ignored_error//g;
     }
-    chomp($errput);
+    $output =~ s/[\s\n]//g;
+    $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'};
   '';
 }
 
@@ -507,5 +533,23 @@ sub ssh_cmd { #subroutine, not method
 #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;