diff options
Diffstat (limited to 'configserver/src/main/java/com/yahoo')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java | 10 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java index 93a6d8c7ca3..93cd68f6dd6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java @@ -22,23 +22,19 @@ public class TenantFileSystemDirs { public TenantFileSystemDirs(File dir, TenantName tenant) { this.serverDB = dir; this.tenant = tenant; - ConfigServerDB.createDirectory(path()); + ConfigServerDB.createDirectory(sessionsPath()); } public static TenantFileSystemDirs createTestDirs(TenantName tenantName) { return new TenantFileSystemDirs(Files.createTempDir(), tenantName); } - public File path() { + public File sessionsPath() { return new File(serverDB, Path.fromString("tenants").append(tenant.value()).append("sessions").getRelative()); } public File getUserApplicationDir(long generation) { - return new File(path(), String.valueOf(generation)); - } - - public String getPath() { - return serverDB.getPath(); + return new File(sessionsPath(), String.valueOf(generation)); } public void delete() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java index 8356077c5a2..bbb9aa58e05 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionRepo.java @@ -29,7 +29,7 @@ public class LocalSessionRepo extends SessionRepo<LocalSession> { public LocalSessionRepo(TenantFileSystemDirs tenantFileSystemDirs, LocalSessionLoader loader, Clock clock, long sessionLifeTime) { this(clock, sessionLifeTime); - loadSessions(tenantFileSystemDirs.path(), loader); + loadSessions(tenantFileSystemDirs.sessionsPath(), loader); } // Constructor public only for testing |