ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: REST API logging for each operation

pull/203/head
pabloFuente 2019-01-24 11:38:43 +01:00
parent 496d33b139
commit 5f1c36a742
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
View File

@ -21,6 +21,8 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -63,6 +65,8 @@ import io.openvidu.server.recording.service.RecordingManager;
@RequestMapping("/api") @RequestMapping("/api")
public class SessionRestController { public class SessionRestController {
private static final Logger log = LoggerFactory.getLogger(SessionRestController.class);
@Autowired @Autowired
private SessionManager sessionManager; private SessionManager sessionManager;
@ -75,6 +79,8 @@ public class SessionRestController {
@RequestMapping(value = "/sessions", method = RequestMethod.POST) @RequestMapping(value = "/sessions", method = RequestMethod.POST)
public ResponseEntity<?> getSessionId(@RequestBody(required = false) Map<?, ?> params) { public ResponseEntity<?> getSessionId(@RequestBody(required = false) Map<?, ?> params) {
log.info("REST API: POST /api/sessions {}", params.toString());
SessionProperties.Builder builder = new SessionProperties.Builder(); SessionProperties.Builder builder = new SessionProperties.Builder();
String customSessionId = null; String customSessionId = null;
@ -144,6 +150,9 @@ public class SessionRestController {
@RequestMapping(value = "/sessions/{sessionId}", method = RequestMethod.GET) @RequestMapping(value = "/sessions/{sessionId}", method = RequestMethod.GET)
public ResponseEntity<?> getSession(@PathVariable("sessionId") String sessionId, public ResponseEntity<?> getSession(@PathVariable("sessionId") String sessionId,
@RequestParam(value = "webRtcStats", defaultValue = "false", required = false) boolean webRtcStats) { @RequestParam(value = "webRtcStats", defaultValue = "false", required = false) boolean webRtcStats) {
log.info("REST API: GET /api/sessions/{}", sessionId);
Session session = this.sessionManager.getSession(sessionId); Session session = this.sessionManager.getSession(sessionId);
if (session != null) { if (session != null) {
JsonObject response = (webRtcStats == true) ? session.withStatsToJson() : session.toJson(); JsonObject response = (webRtcStats == true) ? session.withStatsToJson() : session.toJson();
@ -157,6 +166,9 @@ public class SessionRestController {
@RequestMapping(value = "/sessions", method = RequestMethod.GET) @RequestMapping(value = "/sessions", method = RequestMethod.GET)
public ResponseEntity<?> listSessions( public ResponseEntity<?> listSessions(
@RequestParam(value = "webRtcStats", defaultValue = "false", required = false) boolean webRtcStats) { @RequestParam(value = "webRtcStats", defaultValue = "false", required = false) boolean webRtcStats) {
log.info("REST API: GET /api/sessions");
Collection<Session> sessions = this.sessionManager.getSessionObjects(); Collection<Session> sessions = this.sessionManager.getSessionObjects();
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
JsonArray jsonArray = new JsonArray(); JsonArray jsonArray = new JsonArray();
@ -172,6 +184,9 @@ public class SessionRestController {
@RequestMapping(value = "/sessions/{sessionId}", method = RequestMethod.DELETE) @RequestMapping(value = "/sessions/{sessionId}", method = RequestMethod.DELETE)
public ResponseEntity<?> closeSession(@PathVariable("sessionId") String sessionId) { public ResponseEntity<?> closeSession(@PathVariable("sessionId") String sessionId) {
log.info("REST API: DELETE /api/sessions/{}", sessionId);
Session session = this.sessionManager.getSession(sessionId); Session session = this.sessionManager.getSession(sessionId);
if (session != null) { if (session != null) {
this.sessionManager.closeSession(sessionId, "sessionClosedByServer"); this.sessionManager.closeSession(sessionId, "sessionClosedByServer");
@ -184,6 +199,9 @@ public class SessionRestController {
@RequestMapping(value = "/sessions/{sessionId}/connection/{connectionId}", method = RequestMethod.DELETE) @RequestMapping(value = "/sessions/{sessionId}/connection/{connectionId}", method = RequestMethod.DELETE)
public ResponseEntity<?> disconnectParticipant(@PathVariable("sessionId") String sessionId, public ResponseEntity<?> disconnectParticipant(@PathVariable("sessionId") String sessionId,
@PathVariable("connectionId") String participantPublicId) { @PathVariable("connectionId") String participantPublicId) {
log.info("REST API: DELETE /api/sessions/{}/connection/{}", sessionId, participantPublicId);
Session session = this.sessionManager.getSession(sessionId); Session session = this.sessionManager.getSession(sessionId);
if (session != null) { if (session != null) {
Participant participant = session.getParticipantByPublicId(participantPublicId); Participant participant = session.getParticipantByPublicId(participantPublicId);
@ -201,6 +219,9 @@ public class SessionRestController {
@RequestMapping(value = "/sessions/{sessionId}/stream/{streamId}", method = RequestMethod.DELETE) @RequestMapping(value = "/sessions/{sessionId}/stream/{streamId}", method = RequestMethod.DELETE)
public ResponseEntity<?> unpublishStream(@PathVariable("sessionId") String sessionId, public ResponseEntity<?> unpublishStream(@PathVariable("sessionId") String sessionId,
@PathVariable("streamId") String streamId) { @PathVariable("streamId") String streamId) {
log.info("REST API: DELETE /api/sessions/{}/stream/{}", sessionId, streamId);
Session session = this.sessionManager.getSession(sessionId); Session session = this.sessionManager.getSession(sessionId);
if (session != null) { if (session != null) {
if (this.sessionManager.unpublishStream(session, streamId, null, null, "forceUnpublishByServer")) { if (this.sessionManager.unpublishStream(session, streamId, null, null, "forceUnpublishByServer")) {
@ -215,6 +236,9 @@ public class SessionRestController {
@RequestMapping(value = "/tokens", method = RequestMethod.POST) @RequestMapping(value = "/tokens", method = RequestMethod.POST)
public ResponseEntity<String> newToken(@RequestBody Map<?, ?> params) { public ResponseEntity<String> newToken(@RequestBody Map<?, ?> params) {
log.info("REST API: POST /api/tokens {}", params.toString());
try { try {
String sessionId = (String) params.get("session"); String sessionId = (String) params.get("session");
String roleString = (String) params.get("role"); String roleString = (String) params.get("role");
@ -295,6 +319,8 @@ public class SessionRestController {
@RequestMapping(value = "/recordings/start", method = RequestMethod.POST) @RequestMapping(value = "/recordings/start", method = RequestMethod.POST)
public ResponseEntity<?> startRecordingSession(@RequestBody Map<?, ?> params) { public ResponseEntity<?> startRecordingSession(@RequestBody Map<?, ?> params) {
log.info("REST API: POST /api/recordings/start", params.toString());
String sessionId = (String) params.get("session"); String sessionId = (String) params.get("session");
String name = (String) params.get("name"); String name = (String) params.get("name");
String outputModeString = (String) params.get("outputMode"); String outputModeString = (String) params.get("outputMode");
@ -390,6 +416,8 @@ public class SessionRestController {
@RequestMapping(value = "/recordings/stop/{recordingId}", method = RequestMethod.POST) @RequestMapping(value = "/recordings/stop/{recordingId}", method = RequestMethod.POST)
public ResponseEntity<?> stopRecordingSession(@PathVariable("recordingId") String recordingId) { public ResponseEntity<?> stopRecordingSession(@PathVariable("recordingId") String recordingId) {
log.info("REST API: POST /api/recordings/stop/{}", recordingId);
if (recordingId == null) { if (recordingId == null) {
// "recordingId" parameter not found // "recordingId" parameter not found
return new ResponseEntity<>(HttpStatus.BAD_REQUEST); return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@ -426,6 +454,9 @@ public class SessionRestController {
@RequestMapping(value = "/recordings/{recordingId}", method = RequestMethod.GET) @RequestMapping(value = "/recordings/{recordingId}", method = RequestMethod.GET)
public ResponseEntity<?> getRecording(@PathVariable("recordingId") String recordingId) { public ResponseEntity<?> getRecording(@PathVariable("recordingId") String recordingId) {
log.info("REST API: GET /api/recordings/{}", recordingId);
try { try {
Recording recording = this.recordingManager.getRecording(recordingId); Recording recording = this.recordingManager.getRecording(recordingId);
if (io.openvidu.java.client.Recording.Status.started.equals(recording.getStatus()) if (io.openvidu.java.client.Recording.Status.started.equals(recording.getStatus())
@ -440,6 +471,9 @@ public class SessionRestController {
@RequestMapping(value = "/recordings", method = RequestMethod.GET) @RequestMapping(value = "/recordings", method = RequestMethod.GET)
public ResponseEntity<?> getAllRecordings() { public ResponseEntity<?> getAllRecordings() {
log.info("REST API: GET /api/recordings");
Collection<Recording> recordings = this.recordingManager.getAllRecordings(); Collection<Recording> recordings = this.recordingManager.getAllRecordings();
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
JsonArray jsonArray = new JsonArray(); JsonArray jsonArray = new JsonArray();
@ -457,6 +491,9 @@ public class SessionRestController {
@RequestMapping(value = "/recordings/{recordingId}", method = RequestMethod.DELETE) @RequestMapping(value = "/recordings/{recordingId}", method = RequestMethod.DELETE)
public ResponseEntity<?> deleteRecording(@PathVariable("recordingId") String recordingId) { public ResponseEntity<?> deleteRecording(@PathVariable("recordingId") String recordingId) {
log.info("REST API: DELETE /api/recordings/{}", recordingId);
return new ResponseEntity<>(this.recordingManager.deleteRecordingFromHost(recordingId, false)); return new ResponseEntity<>(this.recordingManager.deleteRecordingFromHost(recordingId, false));
} }