Changeset 1179

Timestamp:

Jun 3, 2015, 7:20:54 PM (9 years ago)

Author:

joergs

Message:

make more external commands work

File:

• obs_notify_generic/obs_notify_generic.pm (modified) (5 diffs)

obs_notify_generic/obs_notify_generic.pm

@@ -76 +76 @@
         }
         if ($match) {
-            if ( $entry->{'log'} ) {
-                $self->log( $type, $paramRef );
-            }
+            my $extra = undef;
             if ( $entry->{'action'} ) {
 
@@ -93 +91 @@
                 eval {
                     my $process =
-                      IPC::Run::start( [ "sh", "-c", $action, "2>&1" ],
+                      IPC::Run::start( [ "sh", "--login", "-c", "HOME=/usr/lib/obs $action", "2>&1" ],
                         \$in, \$out, \$err );
                     $process->finish();
@@ -110 +108 @@
 
                 #print "err: ", $err, "\n";
-                $self->log(
-                    $type,
-                    $paramRef,
-                    {
+                $extra = {
                         'action_template' => $entry->{'action'},
                         'action'          => $action,
                         'returncode'      => $rc,
                         'output'          => $out,
-                    }
-                );
-
+                    };
+            }
+            if ( $entry->{'log'} ) {
+                $self->log( $type, $paramRef, $extra );
             }
         } else {
@@ -139 +135 @@
     my ( $self, $type, $paramRef, $extra ) = @_;
 
-    #my $log = "/srv/obs/log/obs-notify-bareos.log";
     my $fh;
     my $file_opened = 0;
@@ -152 +147 @@
             error_msg( "failed to open log file " . $self->{'logfile'} );
             return 1;
-
-            #$fh = *STDOUT;
         }
     }