From: Dietmar Maurer <dietmar@proxmox.com>
Date: Sun, 15 Feb 2015 09:24:56 +0000 (+0100)
Subject: improve LRM log messages
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0f70400dad2bb63ada9ae18502fb4ed3a43945cc;p=pve-ha-manager.git

improve LRM log messages
---

diff --git a/PVE/HA/LRM.pm b/PVE/HA/LRM.pm
index 85ef655..ec39ce0 100644
--- 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 62f0555..03a228f 100644
--- 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;
     }