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

* Console: Implement webapp state detection and stop button for webapps

Browse Source 
on /configclients (Ticket #1025)
This commit is contained in:
zzz
2013-09-21 16:11:55 +00:00
parent 0ae2d92fcd
commit bd0c18b2e3
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
View File

@ -123,6 +123,8 @@ public class ConfigClientsHandler extends FormHandler {
if (appnum >= 0) { if (appnum >= 0) {
stopClient(appnum); stopClient(appnum);
} else { } else {
List<String> plugins = PluginStarter.getPlugins();
if (plugins.contains(app)) {
try { try {
PluginStarter.stopPlugin(_context, app); PluginStarter.stopPlugin(_context, app);
addFormNotice(_("Stopped plugin {0}", app)); addFormNotice(_("Stopped plugin {0}", app));
@ -130,6 +132,10 @@ public class ConfigClientsHandler extends FormHandler {
addFormError(_("Error stopping plugin {0}", app) + ": " + e); addFormError(_("Error stopping plugin {0}", app) + ": " + e);
_log.error("Error stopping plugin " + app, e); _log.error("Error stopping plugin " + app, e);
} }
} else {
WebAppStarter.stopWebApp(app);
addFormNotice(_("Stopped webapp {0}", app));
}
} }
return; return;
} }

3
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
View File

@ -145,9 +145,10 @@ public class ConfigClientsHelper extends HelperBase {
if (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)) { if (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)) {
String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED)); String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED));
String val = props.getProperty(name); String val = props.getProperty(name);
boolean isRunning = WebAppStarter.isWebAppRunning(app);
renderForm(buf, app, app, !"addressbook".equals(app), renderForm(buf, app, app, !"addressbook".equals(app),
"true".equals(val), RouterConsoleRunner.ROUTERCONSOLE.equals(app), app + ".war", "true".equals(val), RouterConsoleRunner.ROUTERCONSOLE.equals(app), app + ".war",
false, false, false, false, false, true); false, false, false, isRunning, false, !isRunning);
} }
} }
buf.append("</table>\n"); buf.append("</table>\n");