xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-05-22 08:42:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #242 from whowutwut/rsyslog

Browse Source 
Fix #218,  Check file rsyslogd.pid before issuing kill on the pid
This commit is contained in:
Xiaopeng Wang
2015-10-13 21:33:10 +08:00
parent 4bbde50119 8fe3ce628f
commit 0c07cb84ae
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT/debian/postinst
+6 -1
View File
@@ -46,7 +46,12 @@ case "$1" in
/etc/init.d/apache2 restart
kill -HUP $(</var/run/rsyslogd.pid) >/dev/null 2>&1 || :
# Let rsyslogd perform close of any open files
if [ -e /var/run/rsyslogd.pid ]; then
kill -HUP $(</var/run/rsyslogd.pid) >/dev/null 2>&1 || :
elif [ -e /var/run/syslogd.pid ]; then
kill -HUP $(</var/run/syslogd.pid) >/dev/null 2>&1 || :
fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
xCAT/xCAT.spec
+6 -2
View File
@@ -201,8 +201,12 @@ then
cp /etc/xcat/conf.orig/xcat.conf.apach24 /etc/apache2/conf.d/xcat.conf
fi
# Lets rsyslogd perform close all open files
kill -HUP $(</var/run/rsyslogd.pid) >/dev/null 2>&1 || :
# Let rsyslogd perform close of any open files
if [ -e /var/run/rsyslogd.pid ]; then
kill -HUP $(</var/run/rsyslogd.pid) >/dev/null 2>&1 || :
elif [ -e /var/run/syslogd.pid ]; then
kill -HUP $(</var/run/syslogd.pid) >/dev/null 2>&1 || :
fi
%endif
# create dir for the current pid
xCATsn/xCATsn.spec
+7
View File
@@ -156,6 +156,13 @@ if [ -n "$version" ]; then
fi
# Let rsyslogd perform close of any open files
if [ -e /var/run/rsyslogd.pid ]; then
kill -HUP $(</var/run/rsyslogd.pid) >/dev/null 2>&1 || :
elif [ -e /var/run/syslogd.pid ]; then
kill -HUP $(</var/run/syslogd.pid) >/dev/null 2>&1 || :
fi
%endif
# create dir for the current pid and move the original ones from /tmp/xcat to /var/run/xcat