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

Merge branch 'master' of github.com:OpenVidu/openvidu

pull/473/head
OscarSotoSanchez 2020-05-08 12:03:38 +02:00
parent a4d81bdc80 b9e0b62261
commit 4b150bb62c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
View File

@ -306,6 +306,9 @@ public class OpenViduServer implements JsonRpcConfigurer {
log.info(msg); log.info(msg);
// Close the auxiliary ApplicationContext
app.close();
return CONFIG_PROPS; return CONFIG_PROPS;
} }
return null; return null;

2
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -91,7 +91,7 @@ public class OpenviduConfig {
} }
} }
private static final Logger log = LoggerFactory.getLogger(OpenviduConfig.class); protected static final Logger log = LoggerFactory.getLogger(OpenviduConfig.class);
private static final boolean SHOW_PROPERTIES_AS_ENV_VARS = true; private static final boolean SHOW_PROPERTIES_AS_ENV_VARS = true;