config: make log sym dir default to log dir

diff --git a/src/common/debug.cc b/src/common/debug.cc
index 0e490f1c0944660fdd7c0f473e074633815262dc..5b06b092ba781a1acc57b46a7194efaa306c4966 100644 (file)
--- a/src/common/debug.cc
+++ b/src/common/debug.cc
@@ -43,6 +43,9 @@ void _dout_open_log()
       strcat(_dout_dir, g_conf.log_dir);
     }
 
+    if (!g_conf.log_sym_dir)
+      g_conf.log_sym_dir = g_conf.log_dir;
+
     if (g_conf.log_sym_dir[0] == '/') 
       strcpy(_dout_symlink_dir, g_conf.log_sym_dir);
     else {

diff --git a/src/config.cc b/src/config.cc
index 89e49968ff1835b269739c47a3bdf015bbb46c5a..7be31b2edefce6e4d999f813d15d9fbb6aaaee98 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -386,7 +386,7 @@ static struct config_option config_optionsp[] = {
        OPTION(logger_subdir, 0, OPT_STR, 0),
        OPTION(logger_dir, 0, OPT_STR, INSTALL_PREFIX "/var/log/ceph/stat"),
        OPTION(log_dir, 0, OPT_STR, INSTALL_PREFIX "/var/log/ceph"),            // if daemonize == true
-       OPTION(log_sym_dir, 0, OPT_STR, INSTALL_PREFIX "/var/log/ceph"),                // if daemonize == true
+       OPTION(log_sym_dir, 0, OPT_STR, 0),
        OPTION(log_to_stdout, 0, OPT_BOOL, true),
        OPTION(pid_file, 'p', OPT_STR, 0),
        OPTION(conf, 'c', OPT_STR, INSTALL_PREFIX "/etc/ceph/ceph.conf"),

diff --git a/src/vstart.sh b/src/vstart.sh
index 639385d200bc2106e4f6c89649a7c51c663fbd94..0ceca14158cc99f03280b6829cf696a04e126f8a 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -134,7 +134,6 @@ if [ $start_mon -eq 1 ]; then
 ; generated by vstart.sh on `date`
 [global]
        log dir = out
-       log sym dir = out
        logger dir = log
        chdir = ""
        pid file = out/\$type\$id.pid