From ca14002bd16c1657e87c18204978c53b958d5cb6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 4 Jul 2009 16:35:36 +0000
Subject: [PATCH] * Startup: Log clients.config problems
---
router/java/src/net/i2p/router/startup/ClientAppConfig.java | 6 ++++--
.../java/src/net/i2p/router/startup/LoadClientAppsJob.java | 5 +++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
index 13310b3708..70d61f346f 100644
--- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java
+++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
@@ -47,13 +47,15 @@ public class ClientAppConfig {
cfgFile = new File(ctx.getConfigDir(), clientConfigFile);
// fall back to use router.config's clientApp.* lines
- if (!cfgFile.exists())
+ if (!cfgFile.exists()) {
+ System.out.println("Warning - No client config file " + cfgFile.getAbsolutePath());
return ctx.router().getConfigMap();
+ }
try {
DataHelper.loadProps(rv, cfgFile);
} catch (IOException ioe) {
- // _log.warn("Error loading the client app properties from " + cfgFile.getName(), ioe);
+ System.out.println("Error loading the client app properties from " + cfgFile.getAbsolutePath() + ' ' + ioe);
}
return rv;
diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
index 3923adec15..0f86f5b61b 100644
--- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
@@ -29,6 +29,11 @@ public class LoadClientAppsJob extends JobImpl {
_loaded = true;
}
List apps = ClientAppConfig.getClientApps(getContext());
+ if (apps.size() <= 0) {
+ _log.error("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)
--
GitLab