Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
Date: Thu, 19 Oct 2017 22:57:07
Message-Id: 1508453780.a82b7969991774a76af7ace06e5d5ee008f8d518.chutzpah@gentoo
1 commit: a82b7969991774a76af7ace06e5d5ee008f8d518
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 19 22:56:20 2017 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 19 22:56:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82b7969
7
8 sys-cluster/ceph: initd: don't log all daemons to same file
9
10 Package-Manager: Portage-2.3.11, Repoman-2.3.3
11
12 sys-cluster/ceph/files/ceph.confd-r3 | 2 ++
13 sys-cluster/ceph/files/ceph.initd-r5 | 2 +-
14 2 files changed, 3 insertions(+), 1 deletion(-)
15
16 diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3
17 index 54673c2688f..281037c5998 100644
18 --- a/sys-cluster/ceph/files/ceph.confd-r3
19 +++ b/sys-cluster/ceph/files/ceph.confd-r3
20 @@ -14,6 +14,8 @@
21 # settings for openrc supervisor for various ceph daemons
22 #
23 # defaults (can be overidden for each daemon)
24 +# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value
25 +#
26 #respawn_delay=20
27 #respawn_max=5
28 #respawn_period=1800
29
30 diff --git a/sys-cluster/ceph/files/ceph.initd-r5 b/sys-cluster/ceph/files/ceph.initd-r5
31 index 7087de60517..18f539a57a8 100644
32 --- a/sys-cluster/ceph/files/ceph.initd-r5
33 +++ b/sys-cluster/ceph/files/ceph.initd-r5
34 @@ -73,7 +73,7 @@ start_pre() {
35 fi
36
37 if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
38 - supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}"
39 + supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
40 fi
41 done
42 }