From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 3 Jun 2013 08:27:01 +0000 (+0800)
Subject: Added configuration to each init scripts so that they log in their own log file,... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=5853b412af3b9f96366970cddc6e7ac5b4f84311;p=openstack-build%2Fceilometer-build.git

Added configuration to each init scripts so that they log in their own log file, added the corresponding purge postrm and logrotate.

Rewritten-From: 523ca44b74fbed3b4f5b95475089d1fe7aaed824
---

diff --git a/xenial/debian/ceilometer-agent-central.init b/xenial/debian/ceilometer-agent-central.init
index 9a43dd9..1448d50 100644
--- a/xenial/debian/ceilometer-agent-central.init
+++ b/xenial/debian/ceilometer-agent-central.init
@@ -23,6 +23,8 @@ DAEMON_GROUP=${SYS_NAME}
 LOCK_DIR=/var/lock/${SYS_NAME}
 PID_DIR=/var/run/${SYS_NAME}
 PID_FILE=${PID_DIR}/${NAME}.pid
+LOGFILE=/var/log/${SYS_NAME}/${NAME}.log
+DAEMON_ARGS="--config-file=/etc/${SYSNAME}/ceilometer.conf --log-file=$LOGFILE"
 
 [ -x $DAEMON ] || exit 0
 
diff --git a/xenial/debian/ceilometer-agent-central.logrotate b/xenial/debian/ceilometer-agent-central.logrotate
new file mode 100644
index 0000000..9997b88
--- /dev/null
+++ b/xenial/debian/ceilometer-agent-central.logrotate
@@ -0,0 +1,7 @@
+/var/log/ceilometer/ceilometer-agent-central.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/xenial/debian/ceilometer-agent-central.postrm b/xenial/debian/ceilometer-agent-central.postrm
new file mode 100644
index 0000000..410f1f9
--- /dev/null
+++ b/xenial/debian/ceilometer-agent-central.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "${1}" = purge ] ; then
+	rm -f /var/log/ceilometer/ceilometer-agent-central.log*
+	[ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
+fi
+
+#DEBHELPER#
diff --git a/xenial/debian/ceilometer-agent-compute.init b/xenial/debian/ceilometer-agent-compute.init
index f9af5af..31d2873 100644
--- a/xenial/debian/ceilometer-agent-compute.init
+++ b/xenial/debian/ceilometer-agent-compute.init
@@ -23,6 +23,8 @@ DAEMON_GROUP=${SYS_NAME}
 LOCK_DIR=/var/lock/${SYS_NAME}
 PID_DIR=/var/run/${SYS_NAME}
 PID_FILE=${PID_DIR}/${NAME}.pid
+LOGFILE=/var/log/${SYS_NAME}/${NAME}.log 
+DAEMON_ARGS="--config-file=/etc/${SYSNAME}/ceilometer.conf --log-file=$LOGFILE"
 
 [ -x $DAEMON ] || exit 0
 
diff --git a/xenial/debian/ceilometer-agent-compute.logrotate b/xenial/debian/ceilometer-agent-compute.logrotate
new file mode 100644
index 0000000..13d3216
--- /dev/null
+++ b/xenial/debian/ceilometer-agent-compute.logrotate
@@ -0,0 +1,7 @@
+/var/log/ceilometer/ceilometer-agent-compute.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/xenial/debian/ceilometer-agent-compute.postrm b/xenial/debian/ceilometer-agent-compute.postrm
new file mode 100644
index 0000000..4afe19d
--- /dev/null
+++ b/xenial/debian/ceilometer-agent-compute.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "${1}" = purge ] ; then
+	rm -f /var/log/ceilometer/ceilometer-agent-compute.log*
+	[ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
+fi
+
+#DEBHELPER#
diff --git a/xenial/debian/ceilometer-api.init b/xenial/debian/ceilometer-api.init
index 8eca526..a595853 100644
--- a/xenial/debian/ceilometer-api.init
+++ b/xenial/debian/ceilometer-api.init
@@ -24,6 +24,8 @@ DAEMON_GROUP=${SYS_NAME}
 LOCK_DIR=/var/lock/${SYS_NAME}
 PID_DIR=/var/run/${SYS_NAME}
 PID_FILE=${PID_DIR}/${NAME}.pid
+LOGFILE=/var/log/${SYS_NAME}/${NAME}.log 
+DAEMON_ARGS="--config-file=/etc/${SYSNAME}/ceilometer.conf --log-file=$LOGFILE"
 
 [ -x $DAEMON ] || exit 0
 
diff --git a/xenial/debian/ceilometer-api.logrotate b/xenial/debian/ceilometer-api.logrotate
new file mode 100644
index 0000000..4acdfff
--- /dev/null
+++ b/xenial/debian/ceilometer-api.logrotate
@@ -0,0 +1,7 @@
+/var/log/ceilometer/ceilometer-api.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/xenial/debian/ceilometer-api.postrm b/xenial/debian/ceilometer-api.postrm
new file mode 100644
index 0000000..8e034c2
--- /dev/null
+++ b/xenial/debian/ceilometer-api.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "${1}" = purge ] ; then
+	rm -f /var/log/ceilometer/ceilometer-api.log*
+	[ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
+fi
+
+#DEBHELPER#
diff --git a/xenial/debian/ceilometer-collector.init b/xenial/debian/ceilometer-collector.init
index 8e23d2a..f15142d 100644
--- a/xenial/debian/ceilometer-collector.init
+++ b/xenial/debian/ceilometer-collector.init
@@ -24,6 +24,8 @@ DAEMON_GROUP=${SYS_NAME}
 LOCK_DIR=/var/lock/${SYS_NAME}
 PID_DIR=/var/run/${SYS_NAME}
 PID_FILE=${PID_DIR}/${NAME}.pid
+LOGFILE=/var/log/${SYS_NAME}/${NAME}.log 
+DAEMON_ARGS="--config-file=/etc/${SYSNAME}/ceilometer.conf --log-file=$LOGFILE"
 
 [ -x $DAEMON ] || exit 0
 
diff --git a/xenial/debian/ceilometer-collector.logrotate b/xenial/debian/ceilometer-collector.logrotate
new file mode 100644
index 0000000..6c57e09
--- /dev/null
+++ b/xenial/debian/ceilometer-collector.logrotate
@@ -0,0 +1,7 @@
+/var/log/ceilometer/ceilometer-collector.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/xenial/debian/ceilometer-collector.postrm b/xenial/debian/ceilometer-collector.postrm
new file mode 100644
index 0000000..dd84d44
--- /dev/null
+++ b/xenial/debian/ceilometer-collector.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "${1}" = purge ] ; then
+	rm -f /var/log/ceilometer/ceilometer-collector.log*
+	[ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
+fi
+
+#DEBHELPER#
diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 0768eec..fe5d8d2 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,10 @@
+ceilometer (2013.1.1-2) UNRELEASED; urgency=low
+
+  * Added configuration to each init scripts so that they log in their own log
+    file, added the corresponding purge postrm and logrotate.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 03 Jun 2013 16:26:14 +0800
+
 ceilometer (2013.1.1-1) unstable; urgency=low
 
   * New upstream release.