trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dra...@apache.org
Subject [trafficserver] branch 8.0.x updated: Fix to allow runroot to override the configuration directory
Date Thu, 07 Feb 2019 16:10:37 GMT
This is an automated email from the ASF dual-hosted git repository.

dragon pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.0.x by this push:
     new 505214d  Fix to allow runroot to override the configuration directory
505214d is described below

commit 505214d313ee1d6de060f8d4d4c892e009a27231
Author: Bryan Call <bcall@apache.org>
AuthorDate: Wed Feb 6 16:28:42 2019 -0800

    Fix to allow runroot to override the configuration directory
---
 lib/records/RecCore.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index d65ee71..29b6ce7 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -21,6 +21,7 @@
   limitations under the License.
  */
 
+#include "tscore/runroot.h"
 #include "tscore/ink_platform.h"
 #include "tscore/ink_memory.h"
 #include "tscore/ink_string.h"
@@ -1131,7 +1132,7 @@ RecConfigReadConfigDir()
 
   if (const char *env = getenv("PROXY_CONFIG_CONFIG_DIR")) {
     ink_strlcpy(buf, env, sizeof(buf));
-  } else {
+  } else if (get_runroot().empty()) {
     RecGetRecordString("proxy.config.config_dir", buf, sizeof(buf));
   }
 


Mime
View raw message