echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted change related to fatjar. We're using "real" base path in any case.

Browse Source
This commit is contained in:
meeh
2018-07-07 12:27:07 +00:00
parent a916c1a22a
commit 381f390938
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -407,26 +407,8 @@ public class RouterConsoleRunner implements RouterApp {
if (!workDirCreated)
System.err.println("ERROR: Unable to create Jetty temporary work directory");
// NOTE
// This code was added by Meeh @ 22 Apr 2018 for use in the browser bundle.
// In the case of a portable mode, the jar in question isn't routerconsole.jar but itself.
String isPortableStr = System.getProperty("i2p.dir.portableMode");
boolean isPortable = Boolean.parseBoolean(isPortableStr);
String routerConsoleJar = "";
// so Jetty can find WebAppConfiguration
if (isPortable) {
try {
routerConsoleJar = new File(RouterConsoleRunner.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()).getAbsolutePath();
} catch (URISyntaxException e) {
// This shouln't be able to happen.
System.err.println("ERROR: Fatal portable error, can't locate where I (jarfile) am.");
return; // Yes, cancel at this point.
}
} else {
routerConsoleJar = _context.getBaseDir() + "/lib/routerconsole.jar";
}
System.setProperty("jetty.class.path", routerConsoleJar);
System.setProperty("jetty.class.path", _context.getBaseDir() + "/lib/routerconsole.jar");
// FIXME
// http://dev.eclipse.org/mhonarc/lists/jetty-users/msg03487.html
//_server.setGracefulShutdown(1000);