kangaroo-and-rabbit/karideo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DEV] good proeperyy env

Browse Source
This commit is contained in:
Edouard DUPIN 2020-10-25 18:03:04 +01:00
parent 5795939383
commit d0616858dc
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
back/src/org/kar/karideo/ConfigVariable.java
View File

@ -3,7 +3,7 @@ package org.kar.karideo;
public class ConfigVariable { public class ConfigVariable {
public static String getTmpDataFolder() { public static String getTmpDataFolder() {
String out = System.getProperty("org.kar.karideo.dataTmpFolder"); String out = System.getenv("org.kar.karideo.dataTmpFolder");
if (out == null) { if (out == null) {
return "/application/data/tmp"; return "/application/data/tmp";
} }
@ -11,7 +11,7 @@ public class ConfigVariable {
} }
public static String getMediaDataFolder() { public static String getMediaDataFolder() {
String out = System.getProperty("org.kar.karideo.dataFolder"); String out = System.getenv("org.kar.karideo.dataFolder");
if (out == null) { if (out == null) {
return "/application/data/media"; return "/application/data/media";
} }
@ -19,7 +19,7 @@ public class ConfigVariable {
} }
public static String getRestOAuthServer() { public static String getRestOAuthServer() {
String out = System.getProperty("org.kar.karideo.rest.oauth"); String out = System.getenv("org.kar.karideo.rest.oauth");
if (out == null) { if (out == null) {
return "http://localhost:17080/oauth/api/"; return "http://localhost:17080/oauth/api/";
} }
@ -27,7 +27,7 @@ public class ConfigVariable {
} }
public static String getDBHost() { public static String getDBHost() {
String out = System.getProperty("org.kar.karideo.db.host"); String out = System.getenv("org.kar.karideo.db.host");
if (out == null) { if (out == null) {
return "localhost"; return "localhost";
} }
@ -35,7 +35,7 @@ public class ConfigVariable {
} }
public static String getDBPort() { public static String getDBPort() {
String out = System.getProperty("org.kar.karideo.db.port"); String out = System.getenv("org.kar.karideo.db.port");
if (out == null) { if (out == null) {
return "3306"; return "3306";
} }
@ -43,7 +43,7 @@ public class ConfigVariable {
} }
public static String getDBLogin() { public static String getDBLogin() {
String out = System.getProperty("org.kar.karideo.db.login"); String out = System.getenv("org.kar.karideo.db.login");
if (out == null) { if (out == null) {
return "root"; return "root";
} }
@ -51,7 +51,7 @@ public class ConfigVariable {
} }
public static String getDBPassword() { public static String getDBPassword() {
String out = System.getProperty("MYSQL_ROOT_PASSWORD"); String out = System.getenv("MYSQL_ROOT_PASSWORD");
if (out == null) { if (out == null) {
return "klkhj456gkgtkhjgvkujfhjgkjhgsdfhb3467465fgdhdesfgh"; return "klkhj456gkgtkhjgvkujfhjgkjhgsdfhb3467465fgdhdesfgh";
} }
@ -59,7 +59,7 @@ public class ConfigVariable {
} }
public static String getDBName() { public static String getDBName() {
String out = System.getProperty("MYSQL_DATABASE"); String out = System.getenv("MYSQL_DATABASE");
if (out == null) { if (out == null) {
return "karideo"; return "karideo";
} }
@ -67,7 +67,7 @@ public class ConfigVariable {
} }
public static String getlocalAddress() { public static String getlocalAddress() {
String out = System.getProperty("org.kar.karideo.address"); String out = System.getenv("org.kar.karideo.address");
if (out == null) { if (out == null) {
return "http://0.0.0.0:18080/karideo/api/"; return "http://0.0.0.0:18080/karideo/api/";
} }

17
back/src/org/kar/karideo/WebLauncher.java
View File

@ -30,23 +30,6 @@ public class WebLauncher {
} }
public static void main(String[] args) { public static void main(String[] args) {
try {
FileInputStream propFile = new FileInputStream( "/application/properties.txt");
Properties p = new Properties(System.getProperties());
p.load(propFile);
for (String name : p.stringPropertyNames()) {
String value = p.getProperty(name);
// inject property if not define in cmdline:
if (System.getProperty(name) == null) {
System.setProperty(name, value);
}
}
} catch (FileNotFoundException e) {
System.out.println("File of environment variable not found: 'properties.txt'");
} catch (IOException e) {
e.printStackTrace();
}
ResourceConfig rc = new ResourceConfig(); ResourceConfig rc = new ResourceConfig();
// add multipart models .. // add multipart models ..
//rc.register(new MultiPartFeature()); //rc.register(new MultiPartFeature());