etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix change that broke db.properties.override

This commit is contained in:
Darren Shepherd 2013-10-31 09:20:36 -07:00
parent 449b5daa70
commit afaf6370dd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/schema/src/com/cloud/upgrade/DatabaseCreator.java
View File

@ -169,6 +169,12 @@ public class DatabaseCreator {
System.exit(1);
}
try {
TransactionLegacy.initDataSource(dbPropsFile);
} catch (IOException e) {
e.printStackTrace();
System.exit(1);
}
initDB(dbPropsFile, rootPassword, databases, dryRun);
// Process sql files

6
framework/db/src/com/cloud/utils/db/TransactionLegacy.java
View File

@ -1025,8 +1025,10 @@ public class TransactionLegacy {
public static void initDataSource(String propsFileName) throws IOException {
Properties dbProps = new Properties();
File dbPropsFile = PropertiesUtil.findConfigFile(propsFileName);
PropertiesUtil.loadFromFile(dbProps, dbPropsFile);
initDataSource(dbProps);
if (dbPropsFile != null && dbPropsFile.exists()) {
PropertiesUtil.loadFromFile(dbProps, dbPropsFile);
initDataSource(dbProps);
}
}
public static void initDataSource(Properties dbProps) {