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

openvidu-server COTURN DB configuration extended on startup

pull/73/head
pabloFuente 2018-06-07 16:41:13 +02:00
parent 3166f67f0d
commit b480eca0af
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
View File

@ -207,8 +207,10 @@ public abstract class SessionManager {
if (this.coturnCredentialsService.isCoturnAvailable()) { if (this.coturnCredentialsService.isCoturnAvailable()) {
turnCredentials = coturnCredentialsService.createUser(); turnCredentials = coturnCredentialsService.createUser();
if (turnCredentials != null) { if (turnCredentials != null) {
token += "&turnUsername=" + turnCredentials.getUsername(); if (turnCredentials != null) {
token += "&turnCredential=" + turnCredentials.getCredential(); token += "&turnUsername=" + turnCredentials.getUsername();
token += "&turnCredential=" + turnCredentials.getCredential();
}
} }
} }
Token t = new Token(token, role, serverMetadata, turnCredentials); Token t = new Token(token, role, serverMetadata, turnCredentials);
@ -282,8 +284,10 @@ public abstract class SessionManager {
TurnCredentials turnCredentials = null; TurnCredentials turnCredentials = null;
if (this.coturnCredentialsService.isCoturnAvailable()) { if (this.coturnCredentialsService.isCoturnAvailable()) {
turnCredentials = coturnCredentialsService.createUser(); turnCredentials = coturnCredentialsService.createUser();
token += "&turnUsername=" + turnCredentials.getUsername(); if (turnCredentials != null) {
token += "&turnCredential=" + turnCredentials.getCredential(); token += "&turnUsername=" + turnCredentials.getUsername();
token += "&turnCredential=" + turnCredentials.getCredential();
}
} }
Token t = new Token(token, role, serverMetadata, turnCredentials); Token t = new Token(token, role, serverMetadata, turnCredentials);

8
openvidu-server/src/main/java/io/openvidu/server/coturn/BashCoturnCredentialsService.java
View File

@ -22,9 +22,15 @@ public class BashCoturnCredentialsService extends CoturnCredentialsService {
if (response.contains("turnadmin: not found")) { if (response.contains("turnadmin: not found")) {
// No coturn installed in the host machine // No coturn installed in the host machine
log.warn("No COTURN server is installed in the host machine"); log.warn("No COTURN server is installed in the host machine");
log.warn("No COTURN server will be configured for clients");
this.coturnAvailable = false; this.coturnAvailable = false;
} else if (response.contains("Cannot open SQLite DB connection")) {
log.warn("COTURN SQLite database is not accesible at path " + this.coturnDatabaseLocation);
log.warn("No COTURN server will be configured for clients");
this.coturnAvailable = false;
} else {
log.info("COTURN sqlite database location: " + this.openviduConfig.getCoturnSqlite());
} }
log.info("COTURN sqlite database location: " + this.openviduConfig.getCoturnSqlite());
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }