diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-15 15:17:43 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-17 15:34:15 +0200 |
commit | 3450e8da2afd571c24f034e2fb3dc48558a2894e (patch) | |
tree | 2cccdb4c7c559753227f724a096e26b829d545b4 /storage | |
parent | 0180331b0a58aad563b0a6a68fdc8b45aa7e703c (diff) |
create and use underVespaHome
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/storageserver/statemanager.cpp | 5 | ||||
-rw-r--r-- | storage/src/vespa/storage/visiting/visitorlibraries.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/storage/src/vespa/storage/storageserver/statemanager.cpp b/storage/src/vespa/storage/storageserver/statemanager.cpp index 3ba5ba61fcd..3ab6d311d09 100644 --- a/storage/src/vespa/storage/storageserver/statemanager.cpp +++ b/storage/src/vespa/storage/storageserver/statemanager.cpp @@ -505,9 +505,8 @@ namespace { if (advanceCount) ++fileCounter; uint32_t fileIndex = fileCounter % 8; std::ostringstream fileName; - fileName << vespa::Defaults::vespaHome() - << "/tmp/hostinfo." << pid << "." << fileIndex - << ".report"; + fileName << vespa::Defaults::underVespaHome("tmp/hostinfo") + << "." << pid << "." << fileIndex << ".report"; return fileName.str(); } } diff --git a/storage/src/vespa/storage/visiting/visitorlibraries.cpp b/storage/src/vespa/storage/visiting/visitorlibraries.cpp index 2f13c16e42d..39dc49ddf10 100644 --- a/storage/src/vespa/storage/visiting/visitorlibraries.cpp +++ b/storage/src/vespa/storage/visiting/visitorlibraries.cpp @@ -29,8 +29,8 @@ VisitorLibraries::getLibrary(StorageServerInterface& storageServer, const std::s std::string file = libraryPath + "lib" + libName + ".so"; if (!lib->Open(file.c_str())) { std::string error = lib->GetLastErrorString(); - std::string absfile = vespa::Defaults::vespaHome(); - absfile.append("/libexec/vespa/storage/lib" + libName + ".so"); + std::string absfile = vespa::Defaults::underVespaHome("libexec/vespa/storage/"); + absfile.append("lib" + libName + ".so"); if (!lib->Open(absfile.c_str())) { LOG(error, "Could not load library %s: %s", file.c_str(), error.c_str()); |