hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

load config on queue-server

Browse Source
This commit is contained in:
Peter Hormanns 2017-09-19 20:50:14 +02:00
parent b05e5555f2
commit a696ddfc31
3 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java
View File

@ -18,25 +18,24 @@ public class JDBCProcessor extends AbstractProcessor {
final private String driver; final private String driver;
final private String url; final private String url;
final private String user;
final private String password;
final private List<String> sql; final private List<String> sql;
private String errorMsg; private String errorMsg;
public JDBCProcessor(final String driver, final String url, final String user, final String password) {
this.driver = driver;
this.url = url;
this.user = user;
this.password = password;
this.errorMsg = "";
this.sql = new ArrayList<String>();
LOG.info("Constructor 1 - DB-User: " + user + " Password: " + password);
}
public JDBCProcessor(final String driver, final String url) throws ProcessorException { public JDBCProcessor(final String driver, final String url) throws ProcessorException {
this.driver = driver; this.driver = driver;
this.url = url; this.url = url;
this.errorMsg = "";
this.sql = new ArrayList<String>();
}
public void addSQL(String sqlStatement) {
sql.add(sqlStatement);
}
public Object process() throws ProcessorException {
Connection c = null;
String user, password;
final Config config = Config.getInstance(); final Config config = Config.getInstance();
if ("com.mysql.jdbc.Driver".equals(driver)) { if ("com.mysql.jdbc.Driver".equals(driver)) {
user = config.getProperty("mysqladmin.user", "root"); user = config.getProperty("mysqladmin.user", "root");
@ -49,17 +48,7 @@ public class JDBCProcessor extends AbstractProcessor {
throw new ProcessorException("database admin-user configuration failed"); throw new ProcessorException("database admin-user configuration failed");
} }
} }
LOG.info("Constructor 2 - DB-User: " + user + " Password: " + password); LOG.info("process() - DB-User: " + user + " Password: " + password);
this.errorMsg = "";
this.sql = new ArrayList<String>();
}
public void addSQL(String sqlStatement) {
sql.add(sqlStatement);
}
public Object process() throws ProcessorException {
Connection c = null;
try { try {
Class.forName(driver); Class.forName(driver);
c = DriverManager.getConnection(url, user, password); c = DriverManager.getConnection(url, user, password);

11
hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
View File

@ -15,11 +15,12 @@ import de.hsadmin.core.qserv.ProcessorException;
* @author mi * @author mi
*/ */
public class MySqlDatabaseProcessorFactory implements EntityProcessorFactory { public class MySqlDatabaseProcessorFactory implements EntityProcessorFactory {
public static JDBCProcessor createMySqlProcessor(String database,
String user, String password) { // public static JDBCProcessor createMySqlProcessor(String database,
return new JDBCProcessor("com.mysql.jdbc.Driver", // String user, String password) {
"jdbc:mysql://localhost/" + database, user, password); // return new JDBCProcessor("com.mysql.jdbc.Driver",
} // "jdbc:mysql://localhost/" + database, user, password);
// }
public static JDBCProcessor createMySqlAdminProcessor() throws ProcessorException { public static JDBCProcessor createMySqlAdminProcessor() throws ProcessorException {
return new JDBCProcessor("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/"); return new JDBCProcessor("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/");

6
hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
View File

@ -10,9 +10,9 @@ import de.hsadmin.core.qserv.ProcessorException;
public class PgSqlDatabaseProcessorFactory implements EntityProcessorFactory { public class PgSqlDatabaseProcessorFactory implements EntityProcessorFactory {
public static JDBCProcessor createPostgreSqlProcessor(String user, String password) { // public static JDBCProcessor createPostgreSqlProcessor(String user, String password) {
return new JDBCProcessor("org.postgresql.Driver", "jdbc:postgresql://localhost/template1", user, password); // return new JDBCProcessor("org.postgresql.Driver", "jdbc:postgresql://localhost/template1", user, password);
} // }
public static JDBCProcessor createPostgreSqlAdminProcessor() throws ProcessorException { public static JDBCProcessor createPostgreSqlAdminProcessor() throws ProcessorException {
return new JDBCProcessor("org.postgresql.Driver", "jdbc:postgresql://localhost/template1"); return new JDBCProcessor("org.postgresql.Driver", "jdbc:postgresql://localhost/template1");