swap native syslog command with HA environment one

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/HA/CRM.pm b/src/PVE/HA/CRM.pm
index 3eec1ff7c34ef230b02d622c54c4dd97fd326729..3dac3acf5cf3da4560406276ef5fed8f82282a0e 100644 (file)
--- a/src/PVE/HA/CRM.pm
+++ b/src/PVE/HA/CRM.pm
@@ -5,7 +5,6 @@ package PVE::HA::CRM;
 use strict;
 use warnings;
 
-use PVE::SafeSyslog;
 use PVE::Tools;
 use PVE::HA::Tools;
 
@@ -39,7 +38,7 @@ sub new {
 sub shutdown_request {
     my ($self) = @_;
 
-    syslog('info' , "server received shutdown request")
+    $self->{haenv}->log('info' , "server received shutdown request")
        if !$self->{shutdown_request};
 
     $self->{shutdown_request} = 1;

diff --git a/src/test/test-reboot1/log.expect b/src/test/test-reboot1/log.expect
index 733e715637a0a15ce8e069c1478b5322f0b27643..0199941f63bab62d68944adb5b8b4cc5b230902f 100644 (file)
--- a/src/test/test-reboot1/log.expect
+++ b/src/test/test-reboot1/log.expect
@@ -27,6 +27,7 @@ info    125    node3/lrm: stopping service vm:103
 info    125    node3/lrm: service status vm:103 stopped
 info    126    node3/lrm: exit (loop end)
 info    126       reboot: execute crm node3 stop
+info    125    node3/crm: server received shutdown request
 info    145    node3/crm: exit (loop end)
 info    145       reboot: execute power node3 off
 info    145       reboot: execute power node3 on

diff --git a/src/test/test-shutdown1/log.expect b/src/test/test-shutdown1/log.expect
index 11a64d9852f2c6aa92d9278472ec2b7e76121ffe..da7a24bf357ca99339d94143af015233a833fe51 100644 (file)
--- a/src/test/test-shutdown1/log.expect
+++ b/src/test/test-shutdown1/log.expect
@@ -26,6 +26,7 @@ info    125    node3/lrm: stopping service vm:103
 info    125    node3/lrm: service status vm:103 stopped
 info    126    node3/lrm: exit (loop end)
 info    126     shutdown: execute crm node3 stop
+info    125    node3/crm: server received shutdown request
 info    145    node3/crm: exit (loop end)
 info    145     shutdown: execute power node3 off
 info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'

diff --git a/src/test/test-shutdown2/log.expect b/src/test/test-shutdown2/log.expect
index 104e40ef1d9f511db8f3fcb19ba8ee3223523969..4994aa9674bf7257150175a7bab5ae409dc45001 100644 (file)
--- a/src/test/test-shutdown2/log.expect
+++ b/src/test/test-shutdown2/log.expect
@@ -26,6 +26,7 @@ info    125    node3/lrm: stopping service vm:103
 info    125    node3/lrm: service status vm:103 stopped
 info    126    node3/lrm: exit (loop end)
 info    126     shutdown: execute crm node3 stop
+info    125    node3/crm: server received shutdown request
 info    145    node3/crm: exit (loop end)
 info    145     shutdown: execute power node3 off
 info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'

diff --git a/src/test/test-shutdown3/log.expect b/src/test/test-shutdown3/log.expect
index 5cc2eb6f8379240932e5f1f0471d700b15bf1055..c85bcd65e6f06bbba060d3f7e10464a54f4c07e9 100644 (file)
--- a/src/test/test-shutdown3/log.expect
+++ b/src/test/test-shutdown3/log.expect
@@ -26,6 +26,7 @@ info    125    node3/lrm: stopping service ct:103
 info    125    node3/lrm: service status ct:103 stopped
 info    126    node3/lrm: exit (loop end)
 info    126     shutdown: execute crm node3 stop
+info    125    node3/crm: server received shutdown request
 info    145    node3/crm: exit (loop end)
 info    145     shutdown: execute power node3 off
 info    160    node1/crm: node 'node3': state changed from 'online' => 'unknown'

diff --git a/src/test/test-shutdown4/log.expect b/src/test/test-shutdown4/log.expect
index 352dd1b1b9781bbe76e1d9764b791eeb27f4774f..6155401d5e9a78dcde42a5f8f3fdbea5d4b69e1f 100644 (file)
--- a/src/test/test-shutdown4/log.expect
+++ b/src/test/test-shutdown4/log.expect
@@ -26,6 +26,7 @@ info    121    node1/lrm: stopping service vm:100
 info    121    node1/lrm: service status vm:100 stopped
 info    122    node1/lrm: exit (loop end)
 info    122     shutdown: execute crm node1 stop
+info    121    node1/crm: server received shutdown request
 info    140    node1/crm: voluntary release CRM lock
 info    141    node1/crm: exit (loop end)
 info    141     shutdown: execute power node1 off