apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

QuickCloud: also look for consoleproxy.properties using PropertiesUtil.

Browse Source 
When executed with mvn exec:java, the path 'conf' is not on the classpath
This commit is contained in:
Chiradeep Vittal 2013-03-26 10:06:46 -07:00
parent 3d78019e57
commit 21b4635948
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java
View File

@ -17,6 +17,8 @@
package com.cloud.consoleproxy; package com.cloud.consoleproxy;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -34,6 +36,7 @@ import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.xml.DOMConfigurator; import org.apache.log4j.xml.DOMConfigurator;
import com.cloud.consoleproxy.util.Logger; import com.cloud.consoleproxy.util.Logger;
import com.cloud.utils.PropertiesUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpServer;
@ -282,8 +285,17 @@ public class ConsoleProxy {
InputStream confs = ConsoleProxy.class.getResourceAsStream("/conf/consoleproxy.properties"); InputStream confs = ConsoleProxy.class.getResourceAsStream("/conf/consoleproxy.properties");
Properties props = new Properties(); Properties props = new Properties();
if (confs == null) { if (confs == null) {
final File file = PropertiesUtil.findConfigFile("consoleproxy.properties");
if (file == null)
s_logger.info("Can't load consoleproxy.properties from classpath, will use default configuration"); s_logger.info("Can't load consoleproxy.properties from classpath, will use default configuration");
} else { else
try {
confs = new FileInputStream(file);
} catch (FileNotFoundException e) {
s_logger.info("Ignoring file not found exception and using defaults");
}
}
if (confs != null) {
try { try {
props.load(confs); props.load(confs);