Updated Branches: refs/heads/master ba025f8b2 -> b3fd17694
TS-1959 Make traffic_manager honor a few more records.config configs Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6a8ef797 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6a8ef797 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6a8ef797 Branch: refs/heads/master Commit: 6a8ef797a08de1d81251d365c9d82a2b4be435d1 Parents: ba025f8 Author: Leif Hedstrom <[email protected]> Authored: Tue Jun 18 00:16:20 2013 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Mon Jun 24 08:04:00 2013 -0600 ---------------------------------------------------------------------- mgmt/Main.cc | 62 ++++++++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6a8ef797/mgmt/Main.cc ---------------------------------------------------------------------- diff --git a/mgmt/Main.cc b/mgmt/Main.cc index ae2e757..776838c 100644 --- a/mgmt/Main.cc +++ b/mgmt/Main.cc @@ -271,54 +271,35 @@ setup_coredump() } static void -init_dirs(bool use_librecords = true) +init_dirs() { char buf[PATH_NAME_MAX + 1]; - ink_strlcpy(system_config_directory, Layout::get()->sysconfdir, sizeof(system_config_directory)); - ink_strlcpy(system_runtime_dir, Layout::get()->runtimedir, sizeof(system_runtime_dir)); - ink_strlcpy(system_log_dir, Layout::get()->logdir, sizeof(system_log_dir)); - + REC_ReadConfigString(buf, "proxy.config.config_dir", PATH_NAME_MAX); + Layout::get()->relative(system_config_directory, PATH_NAME_MAX, buf); if (access(system_config_directory, R_OK) == -1) { - if (use_librecords) { - REC_ReadConfigString(buf, "proxy.config.config_dir", PATH_NAME_MAX); - Layout::get()->relative(system_config_directory, PATH_NAME_MAX, buf); - } - if (access(system_config_directory, R_OK) == -1) { - mgmt_elog("unable to access() config dir '%s': %d, %s\n", - system_config_directory, errno, strerror(errno)); - mgmt_elog("please set config path via 'proxy.config.config_dir' \n"); - _exit(1); - } + mgmt_elog("unable to access() config dir '%s': %d, %s\n", system_config_directory, errno, strerror(errno)); + mgmt_elog("please set config path via 'proxy.config.config_dir' \n"); + _exit(1); } + ink_strlcpy(mgmt_path, system_config_directory, sizeof(mgmt_path)); - if (access(system_runtime_dir, W_OK) == -1) { - if (use_librecords) { - REC_ReadConfigString(buf, "proxy.config.local_state_dir", PATH_NAME_MAX); - Layout::get()->relative(system_runtime_dir, PATH_NAME_MAX, buf); - } - if (access(system_runtime_dir, R_OK) == -1) { - mgmt_elog("unable to access() local state dir '%s': %d, %s\n", - system_runtime_dir, errno, strerror(errno)); - mgmt_elog("please set 'proxy.config.local_state_dir'\n"); - _exit(1); - } + REC_ReadConfigString(buf, "proxy.config.local_state_dir", PATH_NAME_MAX); + Layout::get()->relative(system_runtime_dir, PATH_NAME_MAX, buf); + if (access(system_runtime_dir, R_OK) == -1) { + mgmt_elog("unable to access() local state dir '%s': %d, %s\n", system_runtime_dir, errno, strerror(errno)); + mgmt_elog("please set 'proxy.config.local_state_dir'\n"); + _exit(1); } + REC_ReadConfigString(buf, "proxy.config.log.logfile_dir", PATH_NAME_MAX); + Layout::get()->relative(system_log_dir, PATH_NAME_MAX, buf); if (access(system_log_dir, W_OK) == -1) { - if (use_librecords) { - REC_ReadConfigString(buf, "proxy.config.log.logfile_dir", PATH_NAME_MAX); - Layout::get()->relative(system_log_dir, PATH_NAME_MAX, buf); - } - if (access(system_log_dir, W_OK) == -1) { - mgmt_elog("unable to access() log dir'%s': %d, %s\n", - system_log_dir, errno, strerror(errno)); - mgmt_elog("please set 'proxy.config.log.logfile_dir'\n"); - _exit(1); - } + mgmt_elog("unable to access() log dir'%s': %d, %s\n", system_log_dir, errno, strerror(errno)); + mgmt_elog("please set 'proxy.config.log.logfile_dir'\n"); + _exit(1); } - } static void @@ -576,7 +557,10 @@ main(int argc, char **argv) diags = diagsConfig->diags; diags->prefix_str = "Manager "; - init_dirs(false);// setup directories + RecLocalInit(); + LibRecordsConfigInit(); + + init_dirs();// setup critical directories, needs LibRecords // Get the config info we need while we are still root extractConfigInfo(mgmt_path, recs_conf, userToRunAs, &fds_throttle); @@ -600,8 +584,6 @@ main(int argc, char **argv) #endif - RecLocalInit(); - LibRecordsConfigInit(); #if TS_HAS_WCCP Init_Errata_Logging(); #endif
