diff options
author | Harald Musum <musum@yahooinc.com> | 2022-08-17 08:19:27 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-08-17 08:19:27 +0200 |
commit | f7a337c3c9b169868a6f911270e9d288dc968636 (patch) | |
tree | eefc981b7e884e9d9def18e33fafed01c88f38cb /configserver/src/main/java/com/yahoo | |
parent | 6de8bd8f16366dce6e3a9a7f22e4516120c72c07 (diff) |
Add session id to response for prepare and activate requests
Adding session id, as documented in the API docs
Diffstat (limited to 'configserver/src/main/java/com/yahoo')
3 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionActiveResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionActiveResponse.java index 55e640d4ec7..0c8c8946cbc 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionActiveResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionActiveResponse.java @@ -18,6 +18,7 @@ public class SessionActiveResponse extends SlimeJsonResponse { Cursor root = metaData.get(); root.setString("tenant", tenantName.value()); + root.setString("session-id", Long.toString(sessionId)); root.setString("message", message); root.setString("url", "http://" + request.getHost() + ":" + request.getPort() + "/application/v2/tenant/" + tenantName + diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareAndActivateResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareAndActivateResponse.java index e436675fb59..617df3868ab 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareAndActivateResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareAndActivateResponse.java @@ -25,6 +25,7 @@ public class SessionPrepareAndActivateResponse extends SlimeJsonResponse { Cursor root = slime.get(); root.setString("tenant", tenantName.value()); + root.setString("session-id", Long.toString(result.sessionId())); root.setString("url", "http://" + request.getHost() + ":" + request.getPort() + "/application/v2/tenant/" + tenantName + "/application/" + applicationId.application().value() + diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareResponse.java index 563f50d0012..ac745f833f9 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/SessionPrepareResponse.java @@ -31,6 +31,7 @@ public class SessionPrepareResponse extends SlimeJsonResponse { Cursor root = deployLog.get().type() != Type.NIX ? deployLog.get() : deployLog.setObject(); root.setString("tenant", tenantName.value()); + root.setString("session-id", Long.toString(sessionId)); root.setString("activate", "http://" + request.getHost() + ":" + request.getPort() + "/application/v2/tenant/" + tenantName.value() + "/session/" + sessionId + "/active"); root.setString("message", "Session " + sessionId + " for tenant '" + tenantName.value() + "' prepared."); |