apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Commit 1460196496d73e0db25c7beb2392cfaf9d591ed7 changed db.properties"

Browse Source 
This reverts commit a3cec3802c4c56173c33ccc1e08af059547fe90e.
This commit is contained in:
Darren Shepherd 2013-10-31 09:20:36 -07:00
parent 24af28290e
commit c1bae7984a
1 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
package com.cloud.upgrade;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
@ -36,7 +37,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.component.SystemIntegrityChecker;
import com.cloud.utils.db.DbProperties;
import com.cloud.utils.db.ScriptRunner;
import com.cloud.utils.db.TransactionLegacy;
@ -94,7 +94,13 @@ public class DatabaseCreator {
}
private static void initDB(String dbPropsFile, String rootPassword, String[] databases, boolean dryRun) {
Properties dbProperties = DbProperties.getDbProperties();
Properties dbProperties = new Properties();
try {
dbProperties.load(new FileInputStream(new File(dbPropsFile)));
} catch (IOException e) {
System.out.println("IOError: unable to load/read db properties file: " + e);
System.exit(1);
}
for (String database: databases) {
String host = dbProperties.getProperty(String.format("db.%s.host", database));