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

Better error reporting on no getdown.txt.

Browse Source
This commit is contained in:
Michael Bayne
2014-07-07 07:52:02 -07:00
parent df4eabbf09
commit 9f40fadeff
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/getdown/data/Application.java
+8 -3
View File
@@ -498,16 +498,21 @@ public class Application
else if ((config = getLocalPath(CONFIG_FILE + "_old")).exists()) { else if ((config = getLocalPath(CONFIG_FILE + "_old")).exists()) {
cdata = ConfigUtil.parseConfig(config, checkPlatform); cdata = ConfigUtil.parseConfig(config, checkPlatform);
} }
// otherwise, issue a warning that we found no getdown file
else {
log.info("Found no getdown.txt file", "appdir", _appdir);
}
} catch (Exception e) { } catch (Exception e) {
log.warning("Failure reading config file", "file", config, e); log.warning("Failure reading config file", "file", config, e);
} }
// if we failed to read our config file, check for an appbase specified via a system // if we failed to read our config file, check for an appbase specified via a system
// property; we can use that to bootstrap ourselves back into operation // property; we can use that to bootstrap ourselves back into operation
if (cdata == null) { if (cdata == null) {
log.info("Found no getdown.txt file. Falling back to appbase system prop", String appbase = SysProps.appBase();
"appbase", SysProps.appBase()); log.info("Attempting to obtain 'appbase' from system property", "appbase", appbase);
cdata = new HashMap<String,Object>(); cdata = new HashMap<String,Object>();
cdata.put("appbase", SysProps.appBase()); cdata.put("appbase", appbase);
} }
// first determine our application base, this way if anything goes wrong later in the // first determine our application base, this way if anything goes wrong later in the