From: Paweł Gołaszewski <blues@pld-linux.org>
Date: Tue, 2 Jun 2009 15:43:41 +0000 (+0000)
Subject: - release 2 - check configuration while restarting
X-Git-Tag: auto/th/collectd-4_7_0-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=commitdiff_plain;h=393f7292cf5b0a56bf7f9e2c16f161cf1dec3275

- release 2 - check configuration while restarting

Changed files:
    TODO -> 1.1
    collectd.init -> 1.3
    collectd.spec -> 1.71
---

diff --git a/TODO b/TODO
new file mode 100644
index 0000000..9c9ac7b
--- /dev/null
+++ b/TODO
@@ -0,0 +1,15 @@
+# TODO:
+- package contrib scripts as %doc
+- perl modules with Collectd classes package to separate package
+- Disabled modules:
+   apple_sensors . . . no             (obvious)
+   ipvs  . . . . . . . no             (ip_vs.h not found - llh to be fixed)
+   libvirt . . . . . . no             (requires library)
+   multimeter  . . . . no             ?
+   onewire . . . . . . no             (needs libowfs)
+   perl  . . . . . . . no             (buggy perl: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072)
+   rrdcached . . . . . no             (requires rrdtool >= 1.4.0)
+   tape  . . . . . . . no             ?
+- logrotate file for logfile plugin
+- %desc -l pl for plugins
+- package SpamAssassin plugin from contrib
diff --git a/collectd.init b/collectd.init
index bce6a5f..7043090 100644
--- a/collectd.init
+++ b/collectd.init
@@ -27,6 +27,10 @@ else
 	exit 0
 fi
 
+checkconfig() {
+	/usr/sbin/collectd -t || exit 1
+}
+
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/collectd ]; then
@@ -51,6 +55,7 @@ stop() {
 
 condrestart() {
 	if [ -f /var/lock/subsys/collectd ]; then
+		checkconfig
 		stop
 		start
 	else
@@ -68,6 +73,7 @@ case "$1" in
   	stop
 	;;
   restart)
+  	checkconfig
 	stop
 	start
 	;;
@@ -78,6 +84,7 @@ case "$1" in
 	condrestart 7
 	;;
   status)
+  	checkconfig
 	status collectd
 	exit $?
 	;;
diff --git a/collectd.spec b/collectd.spec
index 875ac16..5df2bf3 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,18 +1,3 @@
-# TODO:
-# - package contrib scripts as %doc
-# - perl modules with Collectd classes package to separate package
-# - Disabled modules:
-#    apple_sensors . . . no		(obvious)
-#    ipvs  . . . . . . . no		(ip_vs.h not found - llh to be fixed)
-#    libvirt . . . . . . no		(requires library)
-#    multimeter  . . . . no		?
-#    onewire . . . . . . no		(needs libowfs)
-#    perl  . . . . . . . no		(buggy perl: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072)
-#    rrdcached . . . . . no		(requires rrdtool >= 1.4.0)
-#    tape  . . . . . . . no		?
-# - logrotate file for logfile plugin
-# - %desc -l pl for plugins
-#
 # Conditional build:
 %bcond_without	curl		# apache, ascent, bind, curl and nginx plugins
 %bcond_without	dns		# DNS plugin
@@ -41,7 +26,7 @@ Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
 Version:	4.7.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.bz2