improve LRM log messages

diff --git a/PVE/HA/LRM.pm b/PVE/HA/LRM.pm
index 85ef65525ad6a0fd227142ded07fc4bd913258b9..ec39ce0f836d4b88c029363db729345bf86c0664 100644 (file)
--- a/PVE/HA/LRM.pm
+++ b/PVE/HA/LRM.pm
@@ -343,12 +343,11 @@ sub resource_command_finished {
     my $exit_code = -1;
 
     if ($status == -1) {
-       print "RA $sid finished - failed to execute\n";    
+       $haenv->log('err', "resource agent $sid finished - failed to execute");    
     }  elsif (my $sig = ($status & 127)) {
-       print "RA $sid finished - got signal $sig\n";
+       $haenv->log('err', "resource agent $sid finished - got signal $sig");
     } else {
        $exit_code = ($status >> 8);
-       print "RA $sid finished - exit code ${exit_code}\n";
     }
 
     $self->{results}->{$uid} = {

diff --git a/PVE/HA/Sim/RTEnv.pm b/PVE/HA/Sim/RTEnv.pm
index 62f0555d4e27d920492342dd7ca31a65a4da83fa..03a228fe0cc3e9cbed9714ae5540d24e617dcc9c 100644 (file)
--- a/PVE/HA/Sim/RTEnv.pm
+++ b/PVE/HA/Sim/RTEnv.pm
@@ -89,34 +89,34 @@ sub exec_resource_agent {
     if ($cmd eq 'started') {
 
        if ($ss->{$sid}) {
-           print "WORKER status $sid: running\n";
+           $self->log("info", "service status $sid: running");
            return 0;
        }
-       print "START WORKER $sid\n";
+       $self->log("info", "starting service $sid");
        
        $self->sleep(2);
 
        $ss->{$sid} = 1;
        $hardware->write_service_status($nodename, $ss);
 
-       print "END WORKER $sid\n";
+       $self->log("info", "service $sid started");
 
        return 0;
 
     } elsif ($cmd eq 'request_stop' || $cmd eq 'stopped') {
 
        if (!$ss->{$sid}) {
-           print "WORKER status $sid: stopped\n";
+           $self->log("info", "service status $sid: stopped");
            return 0;
        }
-       print "STOP WORKER $sid\n";
+       $self->log("info", "stopping service $sid");
        
        $self->sleep(2);
 
        $ss->{$sid} = 0;
        $hardware->write_service_status($nodename, $ss);
 
-       print "END WORKER $sid\n";
+       $self->log("info", "service $sid stopped");
 
        return 0;
     }