Changeset 2de36ee

Timestamp:

Oct 11, 2018 1:10:33 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

77e539a

Parents:

e68182a

Message:

Console: Remove static Server ref, hang off RCR

Location:

apps/routerconsole/java/src/net/i2p/router/web

Files:

• PluginStarter.java (modified) (2 diffs)
• RouterConsoleRunner.java (modified) (6 diffs)
• WebAppStarter.java (modified) (6 diffs)
• helpers/ConfigClientsHandler.java (modified) (1 diff)
• helpers/ConfigClientsHelper.java (modified) (1 diff)

apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java

@@ -441 +441 @@
 
         // start console webapps in console/webapps
-        ContextHandlerCollection server = WebAppStarter.getConsoleServer();
+        ContextHandlerCollection server = WebAppStarter.getConsoleServer(ctx);
         if (server != null) {
             File consoleDir = new File(pluginDir, "console");
@@ -952 +952 @@
             while(it.hasNext() && !isWarRunning) {
                 String warName = it.next();
-                if(WebAppStarter.isWebAppRunning(warName)) {
+                if(WebAppStarter.isWebAppRunning(ctx, warName)) {
                     isWarRunning = true;
                 }

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -25 +25 @@
 
 import net.i2p.I2PAppContext;
+import net.i2p.app.ClientApp;
 import net.i2p.app.ClientAppManager;
 import net.i2p.app.ClientAppState;
@@ -101 +102 @@
     private final ClientAppManager _mgr;
     private volatile ClientAppState _state = UNINITIALIZED;
-    private static Server _server;
+    private Server _server;
     private static ScheduledExecutorScheduler _jettyTimer;
     private String _listenPort;
@@ -117 +118 @@
         authenticator.setMaxNonceAge(7*24*60*60*1000L);
     }
+    private static final String NAME = "console";
     public static final String JETTY_REALM = "i2prouter";
     private static final String JETTY_ROLE = "routerAdmin";
@@ -265 +267 @@
     /** @since 0.9.4 */
     public String getName() {
-        return "console";
+        return NAME;
     }
 
@@ -282 +284 @@
 
     /**
-     *  SInce _server is now static
+     *  To get to Jetty
      *  @return may be null or stopped perhaps
      *  @since Jetty 6 since it doesn't have Server.getServers()
      */
-    static Server getConsoleServer() {
+    synchronized Server getConsoleServer() {
         return _server;
     }
+
+    /**
+     *  To get to Jetty
+     *  @return may be null or stopped perhaps
+     *  @since 0.9.38
+     */
+    static Server getConsoleServer(I2PAppContext ctx) {
+        ClientApp app = ctx.clientAppManager().getRegisteredApp(NAME);
+        return (app != null) ? ((RouterConsoleRunner)app).getConsoleServer() : null;
+    }
+
 
     /** @since 0.8.13, moved from LogsHelper in 0.9.33 */
@@ -1114 +1127 @@
                 if (ROUTERCONSOLE.equals(app))
                     continue;
-                if (WebAppStarter.isWebAppRunning(app)) {
+                if (WebAppStarter.isWebAppRunning(_context, app)) {
                     try {
                         WebAppStarter.stopWebApp(_context, app);

apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java

@@ -7 +7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
+import net.i2p.I2PAppContext;
 import net.i2p.router.RouterContext;
 import net.i2p.util.FileUtil;
@@ -151 +152 @@
      */
     public static void stopWebApp(RouterContext ctx, String appName) {
-        ContextHandler wac = getWebApp(appName);
+        ContextHandler wac = getWebApp(ctx, appName);
         if (wac == null)
             return;
@@ -159 +160 @@
             wac.stop();
         } catch (Exception ie) {}
-        ContextHandlerCollection server = getConsoleServer();
+        ContextHandlerCollection server = getConsoleServer(ctx);
         if (server == null)
             return;
@@ -174 +175 @@
      *  @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;
@@ -182 +183 @@
     
     /** @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;
@@ -204 +205 @@
      *  @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;

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java

@@ -388 +388 @@
      */
     private void startWebApp(String app) {
-        ContextHandlerCollection s = WebAppStarter.getConsoleServer();
+        ContextHandlerCollection s = WebAppStarter.getConsoleServer(_context);
         if (s != null) {
                     try {

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java

@@ -216 +216 @@
                 String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED));
                 String val = props.getProperty(name);
-                boolean isRunning = WebAppStarter.isWebAppRunning(app);
+                boolean isRunning = WebAppStarter.isWebAppRunning(_context, app);
                 String desc;
                 // use descriptions already tagged elsewhere