- use precache if enabled, see http://nagios.sourceforge.net/docs/3_0/faststartup...

Changed files:
    nagios.init -> 1.23
    nagios.spec -> 1.130

diff --git a/nagios.init b/nagios.init
index cd55aec7aec42713709bdd65a46d6ee5ba36b3b7..f14a25892b80406698af26620522aae0a110d255 100644 (file)
--- a/nagios.init
+++ b/nagios.init
@@ -25,10 +25,14 @@ else
        exit 0
 fi
 
+cfg_file=/etc/nagios/nagios.cfg
+
+# check for precache
+precached_object_file=$(awk -F= '/^precached_object_file/{print $2}' $cfg_file)
+
 # configtest itself
 configtest() {
-       /usr/sbin/nagios -v /etc/nagios/nagios.cfg 2>&1
-       return $?
+       /usr/sbin/nagios ${precached_object_file:+-p} -v $cfg_file
 }
 
 # wrapper for configtest:
@@ -72,7 +76,10 @@ start() {
 
        # remove stale cmd pipe (or nagios won't start if it exists)
        rm -f /var/lib/nagios/rw/nagios.cmd
-       daemon /usr/sbin/nagios -d /etc/nagios/nagios.cfg </dev/null
+
+       # we're safe to use -x as we did verify config prior startup
+       # precached object file also is created in configtest.
+       daemon /usr/sbin/nagios ${precached_object_file:+-u} -d $cfg_file
        RETVAL=$?
        if [ $RETVAL -eq 0 ]; then
                touch /var/lock/subsys/nagios
@@ -101,6 +108,7 @@ reload() {
        checkconfig
        msg_reloading "Nagios"
 
+       # NOTE: precached object file is created in configtest.
        killproc nagios -HUP
        RETVAL=$?
 }

diff --git a/nagios.spec b/nagios.spec
index 30ec5a6e92207a2244d3d9bf7db4e4361ef00c78..b19beaa4296ab26cbddb69c1ab90155512ab0c8d 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -268,7 +268,7 @@ cp -a sample-config $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name '*.in' | xargs rm
 
 # Object data/cache files
-for i in {objects.cache,{comments,downtime,retention,status}.dat,nagios.tmp}; do
+for i in {objects.{cache,precache},{comments,downtime,retention,status}.dat,nagios.tmp}; do
        > $RPM_BUILD_ROOT%{_localstatedir}/$i
 done
 > $RPM_BUILD_ROOT%{_localstatedir}/rw/nagios.cmd
@@ -277,7 +277,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for i in %{_localstatedir}/{objects.cache,{comments,downtime,retention,status}.dat}; do
+for i in %{_localstatedir}/{objects.{cache,precache},{comments,downtime,retention,status}.dat}; do
        [ ! -f $i ] && touch $i
        chown root:nagios $i
        chmod 664 $i
@@ -373,6 +373,7 @@ done
 %attr(2770,root,nagios-data) %dir %{_localstatedir}/spool
 %attr(2770,root,nagios-data) %dir %{_localstatedir}/spool/checkresults
 %attr(664,root,nagios) %ghost %{_localstatedir}/objects.cache
+%attr(664,root,nagios) %ghost %{_localstatedir}/objects.precache
 %attr(664,root,nagios) %ghost %{_localstatedir}/*.dat
 %attr(664,root,nagios) %ghost %{_localstatedir}/%{name}.tmp