summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-06-13 08:53:09 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-06-17 15:34:13 +0200
commit26dcbb4f3081a4ef544f5ff53cf1c969cab17496 (patch)
tree74465f040fb36fec69284b0c51e4c00be9436113 /storage
parenta0e1c22870d39fdf8746c446b6206307832666eb (diff)
VESPA_HOME should not end with / anymore
* best practice for HOME-like env vars is to be just the name of the directory without trailing slash.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/storageserver/statemanager.cpp2
-rw-r--r--storage/src/vespa/storage/visiting/visitorlibraries.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/src/vespa/storage/storageserver/statemanager.cpp b/storage/src/vespa/storage/storageserver/statemanager.cpp
index 4e648aae3f5..3ba5ba61fcd 100644
--- a/storage/src/vespa/storage/storageserver/statemanager.cpp
+++ b/storage/src/vespa/storage/storageserver/statemanager.cpp
@@ -506,7 +506,7 @@ namespace {
uint32_t fileIndex = fileCounter % 8;
std::ostringstream fileName;
fileName << vespa::Defaults::vespaHome()
- << "tmp/hostinfo." << pid << "." << fileIndex
+ << "/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 08fb40ca423..2f13c16e42d 100644
--- a/storage/src/vespa/storage/visiting/visitorlibraries.cpp
+++ b/storage/src/vespa/storage/visiting/visitorlibraries.cpp
@@ -30,7 +30,7 @@ VisitorLibraries::getLibrary(StorageServerInterface& storageServer, const std::s
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");
+ absfile.append("/libexec/vespa/storage/lib" + libName + ".so");
if (!lib->Open(absfile.c_str())) {
LOG(error, "Could not load library %s: %s",
file.c_str(), error.c_str());