UNLOZE/projects-jenz
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finally redid the settings file so DB connections just depend on json file on disk

Browse Source
This commit is contained in:
jenz 2023-06-03 19:34:48 +02:00
parent 64e9000781
commit 768f15ddcd
3 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RaceTimer/racetimer_endpoints/src/main/java/DataMapper/DBCPDataSource.java
View File

@ -17,14 +17,14 @@ import org.apache.commons.dbcp2.BasicDataSource;
*/ */
public class DBCPDataSource { public class DBCPDataSource {
private static BasicDataSource ds = new BasicDataSource(); public static Connection getConnection() throws SQLException {
BasicDataSource ds = new BasicDataSource();
static {
try { try {
settingsInit settingsInit = new settingsInit();
ds.setDriver(new com.mysql.cj.jdbc.Driver()); ds.setDriver(new com.mysql.cj.jdbc.Driver());
ds.setUrl(settings.racetimerURL); ds.setUrl(settingsInit.racetimerURL);
ds.setUsername(settings.racetimerUser); ds.setUsername(settingsInit.racetimerUser);
ds.setPassword(settings.racetimerPassword); ds.setPassword(settingsInit.racetimerPassword);
ds.setMaxTotal(-1); ds.setMaxTotal(-1);
ds.setMinIdle(5); ds.setMinIdle(5);
ds.setMaxIdle(-1); ds.setMaxIdle(-1);
@ -32,9 +32,6 @@ public class DBCPDataSource {
} catch (SQLException ex) { } catch (SQLException ex) {
Logger.getLogger(DBCPDataSource.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(DBCPDataSource.class.getName()).log(Level.SEVERE, null, ex);
} }
}
public static Connection getConnection() throws SQLException {
return ds.getConnection(); return ds.getConnection();
} }

15
RaceTimer/racetimer_endpoints/src/main/java/DataMapper/DBCPDataSource2.java
View File

@ -17,14 +17,14 @@ import org.apache.commons.dbcp2.BasicDataSource;
*/ */
public class DBCPDataSource2 { public class DBCPDataSource2 {
private static BasicDataSource ds = new BasicDataSource(); public static Connection getConnection() throws SQLException {
BasicDataSource ds = new BasicDataSource();
static {
try { try {
settingsInit settingsInit = new settingsInit();
ds.setDriver(new com.mysql.cj.jdbc.Driver()); ds.setDriver(new com.mysql.cj.jdbc.Driver());
ds.setUrl(settings.forumURL); ds.setUrl(settingsInit.forumURL);
ds.setUsername(settings.forumUser); ds.setUsername(settingsInit.forumUser);
ds.setPassword(settings.forumPassword); ds.setPassword(settingsInit.forumPassword);
ds.setMaxTotal(-1); ds.setMaxTotal(-1);
ds.setMinIdle(5); ds.setMinIdle(5);
ds.setMaxIdle(-1); ds.setMaxIdle(-1);
@ -32,9 +32,6 @@ public class DBCPDataSource2 {
} catch (SQLException ex) { } catch (SQLException ex) {
Logger.getLogger(DBCPDataSource.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(DBCPDataSource.class.getName()).log(Level.SEVERE, null, ex);
} }
}
public static Connection getConnection() throws SQLException {
return ds.getConnection(); return ds.getConnection();
} }

43
RaceTimer/racetimer_endpoints/src/main/java/DataMapper/settingsInit.java Normal file
View File

@ -0,0 +1,43 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package DataMapper;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.json.JSONObject;
/**
*
* @author Christian
*/
public class settingsInit {
String text;
public static String racetimerURL = "";
static String racetimerUser = "";
static String racetimerPassword = "";
static String forumURL = "";
static String forumUser = "";
static String forumPassword = "";
public settingsInit() {
try {
this.text = new String(Files.readAllBytes(Paths.get("/opt/tomcat/race_backend_settings.json")), StandardCharsets.UTF_8);
JSONObject obj = new JSONObject(text);
this.racetimerURL = obj.getString("racetimerURL");
this.racetimerUser = obj.getString("racetimerUser");
this.racetimerPassword = obj.getString("racetimerPassword");
this.forumURL = obj.getString("forumURL");
this.forumUser = obj.getString("forumUser");
this.forumPassword = obj.getString("forumPassword");
} catch (IOException ex) {
Logger.getLogger(settingsInit.class.getName()).log(Level.SEVERE, null, ex);
}
}
}