diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java index 09a0def7cfe67ed8501e0efb7ac60818b94c757c..1c1c28568dddbf65e41b9aa9601032179996574a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java @@ -183,7 +183,7 @@ public class ConfigClientsHandler extends FormHandler { for (int cur = 0; cur < clients.size(); cur++) { ClientAppConfig ca = clients.get(cur); Object val = _settings.get(cur + ".enabled"); - if (! ("webConsole".equals(ca.clientName) || "Web console".equals(ca.clientName))) + if (! (RouterConsoleRunner.class.getName().equals(ca.className))) ca.disabled = val == null; // edit of an existing entry String desc = getJettyString("desc" + cur); diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java index 27242397e82a4504563036fcd4ee41878b04d152..13b489d3958d1073490548354aa3f00c87e22fb3 100644 --- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java +++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java @@ -38,14 +38,23 @@ public class LoadClientAppsJob extends JobImpl { } List<ClientAppConfig> apps = ClientAppConfig.getClientApps(getContext()); if (apps.isEmpty()) { - _log.error("Warning - No client apps or router console configured - we are just a router"); + _log.logAlways(Log.WARN, "Warning - No client apps or router console configured - we are just a router"); System.err.println("Warning - No client apps or router console configured - we are just a router"); return; } for(int i = 0; i < apps.size(); i++) { ClientAppConfig app = (ClientAppConfig) apps.get(i); - if (app.disabled) + if (app.disabled) { + if ("net.i2p.router.web.RouterConsoleRunner".equals(app.className)) { + String s = "Warning - Router console is disabled. To enable,\n edit the file " + + ClientAppConfig.configFile(getContext()) + + ",\n change the line \"clientApp." + i + ".startOnLoad=false\"" + + " to \"clientApp." + i + ".startOnLoad=true\",\n and restart."; + _log.logAlways(Log.WARN, s); + System.err.println(s); + } continue; + } String argVal[] = parseArgs(app.args); if (app.delay <= 0) { // run this guy now