trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] 01/03: Fix storage.config path issue for runroot
Date Thu, 11 Oct 2018 17:28:24 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit f0e3c19c1533f3aa8fd730bc4032c3eb70f580e3
Author: Xavier Chi <chitianhaoxp@gmail.com>
AuthorDate: Tue Sep 11 17:44:04 2018 -0500

    Fix storage.config path issue for runroot
    
    
    (cherry picked from commit e983e80c8932d36d7d82093632c426d4678d182b)
---
 iocore/cache/Store.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index 4ee9a44..d302816 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -391,12 +391,7 @@ Store::read_config()
       }
     }
 
-    std::string pp;
-    if (get_runroot().empty()) {
-      pp = Layout::get()->relative(path);
-    } else {
-      pp = Layout::get()->cachedir;
-    }
+    std::string pp = Layout::get()->relative(path);
 
     ns = new Span;
     Debug("cache_init", "Store::read_config - ns = new Span; ns->init(\"%s\",%" PRId64
"), forced volume=%d%s%s", pp.c_str(), size,


Mime
View raw message