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

openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java

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

openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java

@@ -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;