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

* Refactor LoadClientAppsJob.java, move some functions to new

Browse Source 
ClientAppConfig.java, to make them easily available to
      a future configclients.jsp
This commit is contained in:
zzz
2008-06-16 12:19:55 +00:00
parent 7b81062816
commit fb5a8ee0d8
2 changed files with 99 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
router/java/src/net/i2p/router/startup/ClientAppConfig.java Normal file
View File

@@ -0,0 +1,91 @@
package net.i2p.router.startup;
import java.io.IOException;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext;
/**
* Contains a really simple ClientApp "structure" and some static methods
* so they can be used both by LoadClientAppsJob and by the configuration
* page in the router console.
*
*/
public class ClientAppConfig {
/** wait 2 minutes before starting up client apps */
private final static long STARTUP_DELAY = 2*60*1000;
private static final String PROP_CLIENT_CONFIG_FILENAME = "router.clientConfigFile";
private static final String DEFAULT_CLIENT_CONFIG_FILENAME = "clients.config";
// let's keep this really simple
public String className;
public String clientName;
public String args;
public long delay;
public boolean disabled;
public ClientAppConfig(String cl, String client, String a, long d, boolean dis) {
className = cl;
clientName = client;
args = a;
delay = d;
disabled = dis;
}
private static Properties getClientAppProps(RouterContext ctx) {
Properties rv = new Properties();
String clientConfigFile = ctx.getProperty(PROP_CLIENT_CONFIG_FILENAME, DEFAULT_CLIENT_CONFIG_FILENAME);
File cfgFile = new File(clientConfigFile);
// fall back to use router.config's clientApp.* lines
if (!cfgFile.exists())
return ctx.router().getConfigMap();
try {
DataHelper.loadProps(rv, cfgFile);
} catch (IOException ioe) {
// _log.warn("Error loading the client app properties from " + cfgFile.getName(), ioe);
}
return rv;
}
/*
* Go through the properties, and return a List of ClientAppConfig structures
*/
public static List getClientApps(RouterContext ctx) {
Properties clientApps = getClientAppProps(ctx);
List rv = new ArrayList(5);
int i = 0;
while (true) {
String className = clientApps.getProperty("clientApp."+i+".main");
if (className == null)
break;
String clientName = clientApps.getProperty("clientApp."+i+".name");
String args = clientApps.getProperty("clientApp."+i+".args");
String delayStr = clientApps.getProperty("clientApp." + i + ".delay");
String onBoot = clientApps.getProperty("clientApp." + i + ".onBoot");
String disabled = clientApps.getProperty("clientApp." + i + ".startOnLoad");
i++;
boolean dis = disabled != null && "false".equals(disabled);
boolean onStartup = false;
if (onBoot != null)
onStartup = "true".equals(onBoot) || "yes".equals(onBoot);
long delay = (onStartup ? 0 : STARTUP_DELAY);
if (delayStr != null && !onStartup)
try { delay = 1000*Integer.parseInt(delayStr); } catch (NumberFormatException nfe) {}
rv.add(new ClientAppConfig(className, clientName, args, delay, dis));
}
return rv;
}
}

62
router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
View File

@@ -1,13 +1,9 @@
package net.i2p.router.startup;
import java.lang.reflect.Method;
import java.io.IOException;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import net.i2p.data.DataHelper;
import net.i2p.router.JobImpl;
import net.i2p.router.RouterContext;
import net.i2p.util.I2PThread;
@@ -21,11 +17,6 @@ import net.i2p.util.Log;
*/
class LoadClientAppsJob extends JobImpl {
private Log _log;
/** wait 2 minutes before starting up client apps */
private final static long STARTUP_DELAY = 2*60*1000;
private static final String PROP_CLIENT_CONFIG_FILENAME = "router.clientConfigFile";
private static final String DEFAULT_CLIENT_CONFIG_FILENAME = "clients.config";
private static boolean _loaded = false;
public LoadClientAppsJob(RouterContext ctx) {
@@ -37,58 +28,21 @@ class LoadClientAppsJob extends JobImpl {
if (_loaded) return;
_loaded = true;
}
Properties clientApps = getClientApps();
int i = 0;
while (true) {
String className = clientApps.getProperty("clientApp."+i+".main");
if (className == null)
break;
String clientName = clientApps.getProperty("clientApp."+i+".name");
String args = clientApps.getProperty("clientApp."+i+".args");
String delayStr = clientApps.getProperty("clientApp." + i + ".delay");
String onBoot = clientApps.getProperty("clientApp." + i + ".onBoot");
String disabled = clientApps.getProperty("clientApp." + i + ".startOnLoad");
i++;
if (disabled != null && "false".equals(disabled))
List apps = ClientAppConfig.getClientApps(getContext());
for(int i = 0; i < apps.size(); i++) {
ClientAppConfig app = (ClientAppConfig) apps.get(i);
if (app.disabled)
continue;
boolean onStartup = false;
if (onBoot != null)
onStartup = "true".equals(onBoot) || "yes".equals(onBoot);
long delay = (onStartup ? 0 : STARTUP_DELAY);
if (delayStr != null)
try { delay = 1000*Integer.parseInt(delayStr); } catch (NumberFormatException nfe) {}
String argVal[] = parseArgs(args);
if (onStartup) {
String argVal[] = parseArgs(app.args);
if (app.delay == 0) {
// run this guy now
runClient(className, clientName, argVal);
runClient(app.className, app.clientName, argVal);
} else {
// wait before firing it up
getContext().jobQueue().addJob(new DelayedRunClient(getContext(), className, clientName, argVal, delay));
getContext().jobQueue().addJob(new DelayedRunClient(getContext(), app.className, app.clientName, argVal, app.delay));
}
}
}
private Properties getClientApps() {
Properties rv = new Properties();
String clientConfigFile = getContext().getProperty(PROP_CLIENT_CONFIG_FILENAME, DEFAULT_CLIENT_CONFIG_FILENAME);
File cfgFile = new File(clientConfigFile);
// fall back to use router.config's clientApp.* lines
if (!cfgFile.exists())
return getContext().router().getConfigMap();
try {
DataHelper.loadProps(rv, cfgFile);
} catch (IOException ioe) {
_log.warn("Error loading the client app properties from " + cfgFile.getName(), ioe);
}
return rv;
}
private class DelayedRunClient extends JobImpl {
private String _className;
private String _clientName;