From a94d9d049746d264ad01b579576b309555b98e09 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 8 Feb 2019 21:09:12 +0100 Subject: [PATCH] openvidu-server: property "recording" of JSON sessions added in Session class --- .../src/main/java/io/openvidu/server/core/Session.java | 1 + .../java/io/openvidu/server/rest/SessionRestController.java | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Session.java b/openvidu-server/src/main/java/io/openvidu/server/core/Session.java index 6d8b473e..b7897bb3 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Session.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Session.java @@ -159,6 +159,7 @@ public class Session implements SessionInterface { connections.addProperty("numberOfElements", participants.size()); connections.add("content", participants); json.add("connections", connections); + json.addProperty("recording", this.recordingManager.sessionIsBeingRecorded(this.sessionId)); return json; } diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java index e0cf1f38..6dbf9a12 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java @@ -98,13 +98,12 @@ public class SessionRestController { defaultOutputModeString = (String) params.get("defaultOutputMode"); defaultRecordingLayoutString = (String) params.get("defaultRecordingLayout"); defaultCustomLayout = (String) params.get("defaultCustomLayout"); + customSessionId = (String) params.get("customSessionId"); } catch (ClassCastException e) { return this.generateErrorResponse("Type error in some parameter", "/api/sessions", HttpStatus.BAD_REQUEST); } - customSessionId = (String) params.get("customSessionId"); - try { // Safe parameter retrieval. Default values if not defined @@ -175,7 +174,6 @@ public class SessionRestController { Session session = this.sessionManager.getSession(sessionId); if (session != null) { JsonObject response = (webRtcStats == true) ? session.withStatsToJson() : session.toJson(); - response.addProperty("recording", this.recordingManager.sessionIsBeingRecorded(sessionId)); return new ResponseEntity<>(response.toString(), getResponseHeaders(), HttpStatus.OK); } else { Session sessionNotActive = this.sessionManager.getSessionNotActive(sessionId); @@ -200,7 +198,6 @@ public class SessionRestController { JsonArray jsonArray = new JsonArray(); sessions.forEach(s -> { JsonObject sessionJson = (webRtcStats == true) ? s.withStatsToJson() : s.toJson(); - sessionJson.addProperty("recording", this.recordingManager.sessionIsBeingRecorded(s.getSessionId())); jsonArray.add(sessionJson); }); json.addProperty("numberOfElements", sessions.size());