AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #160 from vatsal22/master

Browse Source 
Introduced a new option called sysargs to bootstrap.properties...
This commit is contained in:
Michael Bayne
2018-11-26 12:43:34 -08:00
committed by GitHub
parent 469f4feb0a 94d7852324
commit 0bd22aaacc
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/threerings/getdown/data/Application.java
+1 -1
View File
@@ -1486,7 +1486,7 @@ public class Application
* *
* @param sigVersion if {@code 0} no validation will be performed, if {@code > 0} then this * @param sigVersion if {@code 0} no validation will be performed, if {@code > 0} then this
* should indicate the version of the digest file being validated which indicates which * should indicate the version of the digest file being validated which indicates which
* algorithm to use to verify the signature. See {@link Digest#VESRION}. * algorithm to use to verify the signature. See {@link Digest#VERSION}.
*/ */
protected void downloadControlFile (String path, int sigVersion) protected void downloadControlFile (String path, int sigVersion)
throws IOException throws IOException
core/src/main/java/com/threerings/getdown/data/EnvConfig.java
+17 -1
View File
@@ -53,7 +53,7 @@ public final class EnvConfig {
String appDir = null, appDirProv = null; String appDir = null, appDirProv = null;
String appId = null, appIdProv = null; String appId = null, appIdProv = null;
String appBase = null, appBaseProv = null; String appBase = null, appBaseProv = null;
String[] sysargs;
// start with bootstrap.properties config, if avaialble // start with bootstrap.properties config, if avaialble
try { try {
ResourceBundle bundle = ResourceBundle.getBundle("bootstrap"); ResourceBundle bundle = ResourceBundle.getBundle("bootstrap");
@@ -70,6 +70,22 @@ public final class EnvConfig {
appBase = bundle.getString("appbase"); appBase = bundle.getString("appbase");
appBaseProv = "bootstrap.properties"; appBaseProv = "bootstrap.properties";
} }
// Set system properties. Should be in the form:
// sysargs = [key1]:[val1] , [key2]:[val2], [key3]
if (bundle.containsKey("sysargs")) {
sysargs = bundle.getString("sysargs").split(",");
for (String sysarg : sysargs) {
String[] arg_value = sysarg.trim().split(":", 2);
if(arg_value.length == 2){
System.setProperty(arg_value[0], arg_value[1]);
}else if(arg_value.length == 1) {
System.setProperty(arg_value[0], "");
}
}
}
} catch (MissingResourceException e) { } catch (MissingResourceException e) {
// bootstrap.properties is optional; no need for a warning // bootstrap.properties is optional; no need for a warning
} }