From c7d94d584fe349efae99cdd3aaaca3f976eea8c8 Mon Sep 17 00:00:00 2001
From: Sylvain Baubeau <sylvain.baubeau@enovance.com>
Date: Tue, 8 Apr 2014 14:32:04 +0200
Subject: [PATCH] Allow selecting log destination for Ceilometer daemons

Rewritten-From: cf3bdff2dc4ca35ef1fb8dcd6bb393093ac4a6ec
---
 xenial/debian/ceilometer-agent-central.init            |  8 +++++++-
 xenial/debian/ceilometer-agent-central.upstart.in      | 10 +++++++++-
 xenial/debian/ceilometer-agent-compute.init            |  8 +++++++-
 xenial/debian/ceilometer-agent-compute.upstart.in      | 10 +++++++++-
 xenial/debian/ceilometer-agent-notification.init       |  8 +++++++-
 xenial/debian/ceilometer-agent-notification.upstart.in | 10 +++++++++-
 xenial/debian/ceilometer-alarm-evaluator.init          |  8 +++++++-
 xenial/debian/ceilometer-alarm-evaluator.upstart.in    | 10 +++++++++-
 xenial/debian/ceilometer-alarm-notifier.init           |  8 +++++++-
 xenial/debian/ceilometer-alarm-notifier.upstart.in     | 10 +++++++++-
 xenial/debian/ceilometer-api.init                      |  8 +++++++-
 xenial/debian/ceilometer-api.upstart.in                | 10 +++++++++-
 xenial/debian/ceilometer-collector.init                |  8 +++++++-
 xenial/debian/ceilometer-collector.upstart.in          | 10 +++++++++-
 14 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/xenial/debian/ceilometer-agent-central.init b/xenial/debian/ceilometer-agent-central.init
index 3d1985a..e944f8f 100644
--- a/xenial/debian/ceilometer-agent-central.init
+++ b/xenial/debian/ceilometer-agent-central.init
@@ -26,7 +26,7 @@ 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/${SYS_NAME}/ceilometer.conf --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -37,6 +37,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \
diff --git a/xenial/debian/ceilometer-agent-central.upstart.in b/xenial/debian/ceilometer-agent-central.upstart.in
index d18092a..44319bd 100644
--- a/xenial/debian/ceilometer-agent-central.upstart.in
+++ b/xenial/debian/ceilometer-agent-central.upstart.in
@@ -14,4 +14,12 @@ pre-start script
 	chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-agent-central --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-agent-central.log" ceilometer
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-agent-central --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script
diff --git a/xenial/debian/ceilometer-agent-compute.init b/xenial/debian/ceilometer-agent-compute.init
index 5b7da4b..0b9ef93 100644
--- a/xenial/debian/ceilometer-agent-compute.init
+++ b/xenial/debian/ceilometer-agent-compute.init
@@ -26,7 +26,7 @@ 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/${SYS_NAME}/ceilometer.conf --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -37,6 +37,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \
diff --git a/xenial/debian/ceilometer-agent-compute.upstart.in b/xenial/debian/ceilometer-agent-compute.upstart.in
index c37f5c8..de8c2ca 100644
--- a/xenial/debian/ceilometer-agent-compute.upstart.in
+++ b/xenial/debian/ceilometer-agent-compute.upstart.in
@@ -14,4 +14,12 @@ pre-start script
 	chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-agent-compute --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-agent-compute.log" ceilometer
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-agent-compute --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script
diff --git a/xenial/debian/ceilometer-agent-notification.init b/xenial/debian/ceilometer-agent-notification.init
index 88cb7f1..876e6e7 100644
--- a/xenial/debian/ceilometer-agent-notification.init
+++ b/xenial/debian/ceilometer-agent-notification.init
@@ -26,7 +26,7 @@ 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/${SYS_NAME}/ceilometer.conf --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -37,6 +37,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \
diff --git a/xenial/debian/ceilometer-agent-notification.upstart.in b/xenial/debian/ceilometer-agent-notification.upstart.in
index 22793c6..22807e4 100644
--- a/xenial/debian/ceilometer-agent-notification.upstart.in
+++ b/xenial/debian/ceilometer-agent-notification.upstart.in
@@ -14,4 +14,12 @@ pre-start script
 	chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-agent-notification --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-agent-notification.log" ceilometer
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-agent-notification --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script
diff --git a/xenial/debian/ceilometer-alarm-evaluator.init b/xenial/debian/ceilometer-alarm-evaluator.init
index 39b2031..4aebafb 100644
--- a/xenial/debian/ceilometer-alarm-evaluator.init
+++ b/xenial/debian/ceilometer-alarm-evaluator.init
@@ -26,7 +26,7 @@ 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/${SYS_NAME}/ceilometer.conf --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -37,6 +37,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \
diff --git a/xenial/debian/ceilometer-alarm-evaluator.upstart.in b/xenial/debian/ceilometer-alarm-evaluator.upstart.in
index d41e565..a5688d7 100644
--- a/xenial/debian/ceilometer-alarm-evaluator.upstart.in
+++ b/xenial/debian/ceilometer-alarm-evaluator.upstart.in
@@ -14,4 +14,12 @@ pre-start script
 	chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-evaluator.log" ceilometer
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script
diff --git a/xenial/debian/ceilometer-alarm-notifier.init b/xenial/debian/ceilometer-alarm-notifier.init
index 466b96c..8173cc8 100644
--- a/xenial/debian/ceilometer-alarm-notifier.init
+++ b/xenial/debian/ceilometer-alarm-notifier.init
@@ -26,7 +26,7 @@ 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/${SYS_NAME}/ceilometer.conf --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -37,6 +37,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \
diff --git a/xenial/debian/ceilometer-alarm-notifier.upstart.in b/xenial/debian/ceilometer-alarm-notifier.upstart.in
index 8cf8ba0..b847d8c 100644
--- a/xenial/debian/ceilometer-alarm-notifier.upstart.in
+++ b/xenial/debian/ceilometer-alarm-notifier.upstart.in
@@ -14,4 +14,12 @@ pre-start script
 	chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-notifier.log" ceilometer
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script
diff --git a/xenial/debian/ceilometer-api.init b/xenial/debian/ceilometer-api.init
index d5bafc8..3aba0aa 100644
--- a/xenial/debian/ceilometer-api.init
+++ b/xenial/debian/ceilometer-api.init
@@ -27,7 +27,7 @@ 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/${SYS_NAME}/ceilometer.conf --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -38,6 +38,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \
diff --git a/xenial/debian/ceilometer-api.upstart.in b/xenial/debian/ceilometer-api.upstart.in
index 5e9ff3e..59df6e6 100644
--- a/xenial/debian/ceilometer-api.upstart.in
+++ b/xenial/debian/ceilometer-api.upstart.in
@@ -14,4 +14,12 @@ pre-start script
 	chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-api --log-file /var/log/ceilometer/ceilometer-api.log --config-file /etc/ceilometer/ceilometer.conf" ceilometer
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-api --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script
diff --git a/xenial/debian/ceilometer-collector.init b/xenial/debian/ceilometer-collector.init
index d584ffc..205bf42 100644
--- a/xenial/debian/ceilometer-collector.init
+++ b/xenial/debian/ceilometer-collector.init
@@ -27,7 +27,7 @@ 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/${SYS_NAME}/ceilometer.conf --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -38,6 +38,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \
diff --git a/xenial/debian/ceilometer-collector.upstart.in b/xenial/debian/ceilometer-collector.upstart.in
index 2a60710..744bfe6 100644
--- a/xenial/debian/ceilometer-collector.upstart.in
+++ b/xenial/debian/ceilometer-collector.upstart.in
@@ -14,4 +14,12 @@ pre-start script
 	chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-collector.log" ceilometer
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script
-- 
2.32.3