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

Console: Remove static Server ref, hang off RCR

Browse Source
This commit is contained in:
zzz
2018-10-11 13:10:33 +00:00
parent e68182a157
commit 2de36ee343
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
View File

@@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import net.i2p.I2PAppContext;
import net.i2p.router.RouterContext;
import net.i2p.util.FileUtil;
import net.i2p.util.PortMapper;
@@ -150,7 +151,7 @@ public class WebAppStarter {
* @since public since 0.9.33, was package private
*/
public static void stopWebApp(RouterContext ctx, String appName) {
ContextHandler wac = getWebApp(appName);
ContextHandler wac = getWebApp(ctx, appName);
if (wac == null)
return;
ctx.portMapper().unregister(appName);
@@ -158,7 +159,7 @@ public class WebAppStarter {
// not graceful is default in Jetty 6?
wac.stop();
} catch (Exception ie) {}
ContextHandlerCollection server = getConsoleServer();
ContextHandlerCollection server = getConsoleServer(ctx);
if (server == null)
return;
try {
@@ -173,16 +174,16 @@ public class WebAppStarter {
*
* @since public since 0.9.33; was package private
*/
public static boolean isWebAppRunning(String appName) {
ContextHandler wac = getWebApp(appName);
public static boolean isWebAppRunning(I2PAppContext ctx, String appName) {
ContextHandler wac = getWebApp(ctx, appName);
if (wac == null)
return false;
return wac.isStarted();
}
/** @since Jetty 6 */
static ContextHandler getWebApp(String appName) {
ContextHandlerCollection server = getConsoleServer();
static ContextHandler getWebApp(I2PAppContext ctx, String appName) {
ContextHandlerCollection server = getConsoleServer(ctx);
if (server == null)
return null;
Handler handlers[] = server.getHandlers();
@@ -203,8 +204,8 @@ public class WebAppStarter {
* See comments in ConfigClientsHandler
* @since public since 0.9.33, was package private
*/
public static ContextHandlerCollection getConsoleServer() {
Server s = RouterConsoleRunner.getConsoleServer();
public static ContextHandlerCollection getConsoleServer(I2PAppContext ctx) {
Server s = RouterConsoleRunner.getConsoleServer(ctx);
if (s == null)
return null;
Handler h = s.getChildHandlerByClass(ContextHandlerCollection.class);