diff options
8 files changed, 27 insertions, 17 deletions
diff --git a/config/src/vespa/config/common/configsystem.cpp b/config/src/vespa/config/common/configsystem.cpp index ba604d04aee..a787b3867fd 100644 --- a/config/src/vespa/config/common/configsystem.cpp +++ b/config/src/vespa/config/common/configsystem.cpp @@ -11,8 +11,7 @@ namespace config { namespace { vespalib::string getConfigProxyFileName() { - vespalib::string root(vespa::Defaults::vespaHome()); - return root + "/var/run/configproxy.pid"; + return vespa::Defaults::underVespaHome("var/run/configproxy.pid"); } } diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp index a7d290bde93..923bc044bdf 100644 --- a/defaults/src/vespa/defaults.cpp +++ b/defaults/src/vespa/defaults.cpp @@ -157,6 +157,22 @@ Defaults::vespaHome() return defaultHome; } +std::string +Defaults::underVespaHome(const char *path) +{ + if (path[0] == '/') { + return path; + } + if (path[0] == '.' && path[1] == '/') { + return path; + } + findDefaults(); + std::string ret = defaultHome; + ret += '/'; + ret += path; + return ret; +} + const char * Defaults::vespaUser() { diff --git a/defaults/src/vespa/defaults.h b/defaults/src/vespa/defaults.h index 2785ef46677..53e44b3f526 100644 --- a/defaults/src/vespa/defaults.h +++ b/defaults/src/vespa/defaults.h @@ -25,6 +25,8 @@ public: **/ static const char *vespaHome(); + static std::string underVespaHome(const char *path); + /** * Compute the user name to own directories and run processes. * @return the vespa user name diff --git a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp index 29ca5da7868..ffc82caf4b2 100644 --- a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp +++ b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp @@ -585,8 +585,7 @@ ZKFacade::disableRetries() { ZKLogging::ZKLogging() : _file(nullptr) { - std::string filename(vespa::Defaults::vespaHome()); - filename.append("/tmp/zookeeper.log"); + std::string filename = vespa::Defaults::underVespaHome("tmp/zookeeper.log"); _file = std::fopen(filename.c_str(), "w"); if (_file == nullptr) { LOGFWD(error, "Could not open file '%s'", filename.c_str()); diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp b/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp index 9c962ceda50..601888c88cc 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp @@ -9,8 +9,7 @@ namespace { struct DiskApp : public FastOS_Application { int Main() override { try { - std::string dir = vespa::Defaults::vespaHome(); - dir.append("/var/db/vespa/vds"); + std::string dir = vespa::Defaults::underVespaHome("var/db/vespa/vds"); return storage::memfile::VdsDiskTool::run( _argc, _argv, dir.c_str(), std::cout, std::cerr); 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()); diff --git a/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp b/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp index 0220f196185..bc640370799 100644 --- a/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp +++ b/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp @@ -11,15 +11,11 @@ namespace { std::string masterInbox() { - std::string dir = vespa::Defaults::vespaHome(); - dir.append("/var/spool/master/inbox"); - return dir; + return vespa::Defaults::underVespaHome("var/spool/master/inbox"); } std::string outboxParent() { - std::string dir = vespa::Defaults::vespaHome(); - dir.append("/var/spool/vespa"); - return dir; + return vespa::Defaults::underVespaHome("var/spool/vespa"); } } |