vstart: put logging options in daemon sections, not [global]

We don't want random command line utils to have non-default logging
behavior.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/vstart.sh b/src/vstart.sh
index 41713ac8ea57f8397c747ab159252fd6d7a7f733..3992a78976fc39530c0ca03a56720c476a14be41 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -245,6 +245,16 @@ do
     [ $count -eq $CEPH_NUM_MON ] && break;
 done
 
+DAEMONOPTS="
+       log dir = out
+       log per instance = true
+       log sym history = 100
+        profiling logger = true
+       profiling logger dir = log
+       chdir = ""
+       pid file = out/\$name.pid
+"
+
 
 if [ "$start_mon" -eq 1 ]; then
        if [ "$new" -eq 1 ]; then
@@ -258,13 +268,6 @@ if [ "$start_mon" -eq 1 ]; then
 ; generated by vstart.sh on `date`
 [global]
         keyring = .ceph_keyring
-       log dir = out
-       log per instance = true
-       log sym history = 100
-        profiling logger = true
-       profiling logger dir = log
-       chdir = ""
-       pid file = out/\$name.pid
 $extra_conf
 EOF
                        [ "$cephx" -eq 1 ] && cat<<EOF >> $conf
@@ -272,13 +275,16 @@ EOF
 EOF
                        cat <<EOF >> $conf
 [mds]
+$DAEMONOPTS
 $CMDSDEBUG
         mds debug frag = true
 [osd]
+$DAEMONOPTS
         osd class tmp = out
         osd scrub load threshold = 5.0
 $COSDDEBUG
 [mon]
+$DAEMONOPTS
 $CMONDEBUG
 
 [group everyone]