Author: pferraro
Date: 2008-09-17 21:47:00 -0400 (Wed, 17 Sep 2008)
New Revision: 1860
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java
Log:
More logic consolidation
Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java
===================================================================
--- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java 2008-09-17
22:42:20 UTC (rev 1859)
+++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/MCMPUtils.java 2008-09-18
01:47:00 UTC (rev 1860)
@@ -171,31 +171,41 @@
public static MCMPRequest createEnableAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.ENABLE_APP, false,
createContextParameters(context));
+ return createRequest(MCMPRequestType.ENABLE_APP, context);
}
public static MCMPRequest createDisableAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.DISABLE_APP, false,
createContextParameters(context));
+ return createRequest(MCMPRequestType.DISABLE_APP, context);
}
public static MCMPRequest createStopAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.STOP_APP, false,
createContextParameters(context));
+ return createRequest(MCMPRequestType.STOP_APP, context);
}
public static MCMPRequest createRemoveAppRequest(Context context)
{
- return new MCMPRequest(MCMPRequestType.REMOVE_APP, false,
createContextParameters(context));
+ return createRequest(MCMPRequestType.REMOVE_APP, context);
}
- public static MCMPRequest createStatusRequest(Engine engine, int lbf)
+ private static MCMPRequest createRequest(MCMPRequestType type, Context context)
{
Map<String, String> parameters = new HashMap<String, String>();
- parameters.put("JVMRoute", engine.getJvmRoute());
- parameters.put("Load", String.valueOf(lbf));
- return new MCMPRequest(MCMPRequestType.STATUS, false, parameters);
+ parameters.put("JVMRoute", Utils.getJvmRoute(context));
+
+ String path = context.getPath();
+
+ parameters.put("Context", "".equals(path) ? "/" :
path);
+ parameters.put("Alias", Utils.getHost(context));
+
+ return new MCMPRequest(type, false, parameters);
}
+
+ public static MCMPRequest createStatusRequest(Engine engine, int lbf)
+ {
+ return createStatusRequest(engine.getJvmRoute(), lbf);
+ }
public static MCMPRequest createStatusRequest(String jvmRoute, int lbf)
{
@@ -207,19 +217,24 @@
public static MCMPRequest createEnableEngineRequest(Engine engine)
{
- return new MCMPRequest(MCMPRequestType.ENABLE_APP, true,
createEngineParameters(engine));
+ return createRequest(MCMPRequestType.ENABLE_APP, engine);
}
public static MCMPRequest createDisableEngineRequest(Engine engine)
{
- return new MCMPRequest(MCMPRequestType.DISABLE_APP, true,
createEngineParameters(engine));
+ return createRequest(MCMPRequestType.DISABLE_APP, engine);
}
public static MCMPRequest createRemoveAllRequest(Engine engine)
{
- return new MCMPRequest(MCMPRequestType.REMOVE_APP, true,
createEngineParameters(engine));
+ return createRequest(MCMPRequestType.REMOVE_APP, engine);
}
+ private static MCMPRequest createRequest(MCMPRequestType type, Engine engine)
+ {
+ return new MCMPRequest(type, true, Collections.singletonMap("JVMRoute",
engine.getJvmRoute()));
+ }
+
/**
* Reset configuration for a particular proxy following an error.
*/
@@ -258,26 +273,6 @@
return INFO;
}
- private static Map<String, String> createEngineParameters(Engine engine)
- {
- Map<String, String> parameters = new HashMap<String, String>();
- parameters.put("JVMRoute", engine.getJvmRoute());
- return parameters;
- }
-
- private static Map<String, String> createContextParameters(Context context)
- {
- Map<String, String> parameters = new HashMap<String, String>();
- parameters.put("JVMRoute", Utils.getJvmRoute(context));
-
- String path = context.getPath();
-
- parameters.put("Context", "".equals(path) ? "/" :
path);
- parameters.put("Alias", Utils.getHost(context));
-
- return parameters;
- }
-
public static AddressPort parseAddressPort(String addressPort)
{
try