Skip to content

Adding possibility to use env variables for db connection #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lassehavet wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adding possibility to use env variables for db connection #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/de/oc/integration/jasper/webapp/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ public class AppConfig {
public static final String OC_JASPER_WEBAPP_HOME = "oc.jasper.webapp.home";
public static final String OC_JASPER_LOG_DIR = "oc.jasper.log.dir";
public static final java.lang.String APPLICATION_PROPERTIES_FILE = "application.properties";
private static final String DB_URL = "db_url";
private static final String DB_USER = "db_user";
private static final String DB_PWD = "db_password";


// ----------------------------------------------------
Expand Down Expand Up @@ -355,9 +358,12 @@ private void processConfigFile(HierarchicalINIConfiguration props) {
if (sectionName.startsWith("datasource:")) {
logger.trace("datasource section found=" + sectionName);
String dsName = sectionName.split(":")[1];
DataSourceDefinition ds = new DataSourceDefinition(props.getString(sectionName + ".type"), dsName,
props.getString(sectionName + ".url"), props.getString(sectionName + ".username"),
decryptPWD(props.getString(sectionName + ".password")),
DataSourceDefinition ds = new DataSourceDefinition(
props.getString(sectionName + ".type"),
dsName,
System.getenv(DB_URL) != null ? System.getenv(DB_URL) : props.getString(sectionName + ".url"),
System.getenv(DB_USER) != null ? System.getenv(DB_USER) : props.getString(sectionName + ".username"),
System.getenv(DB_PWD) != null ? System.getenv(DB_PWD) : decryptPWD(props.getString(sectionName + ".password")),
props.getStringArray(sectionName + ".ipAddressesAllowed"));

_dataSourceDefinitions.put(dsName, ds);
Expand Down