JBoss Native SVN: r2357 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 12:54:45 -0400 (Thu, 12 Mar 2009)
New Revision: 2357
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
Add debug...
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-03-12 15:34:06 UTC (rev 2356)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-03-12 16:54:45 UTC (rev 2357)
@@ -1364,11 +1364,9 @@
sessionid = cluster_get_sessionid(r, balancer->sticky, r->uri, &sticky_used);
if (sessionid) {
-#if HAVE_CLUSTER_EX_DEBUG
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"cluster: Found value %s for "
"stickysession %s", sessionid, balancer->sticky);
-#endif
if ((route = strchr(sessionid, '.')) != NULL )
route++;
if (route && *route) {
15 years, 9 months
JBoss Native SVN: r2356 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 11:34:06 -0400 (Thu, 12 Mar 2009)
New Revision: 2356
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
typo.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2009-03-12 14:58:28 UTC (rev 2355)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2009-03-12 15:34:06 UTC (rev 2356)
@@ -245,7 +245,7 @@
)
done
(cd ../mod_cluster/target
- tar -zf - *.so | gzip -c > ${build_top}/output/${PACKAGE}-${build_version}-${BUILD_SYS}-${BUILD_CPU}-so.tar.gz
+ tar -cf - *.so | gzip -c > ${build_top}/output/${PACKAGE}-${build_version}-${BUILD_SYS}-${BUILD_CPU}-so.tar.gz
)
fi
15 years, 9 months
JBoss Native SVN: r2355 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 10:58:28 -0400 (Thu, 12 Mar 2009)
New Revision: 2355
Modified:
trunk/mod_cluster/test/java/README.txt
Log:
Add a note how to run just the tests...
Modified: trunk/mod_cluster/test/java/README.txt
===================================================================
--- trunk/mod_cluster/test/java/README.txt 2009-03-12 12:58:37 UTC (rev 2354)
+++ trunk/mod_cluster/test/java/README.txt 2009-03-12 14:58:28 UTC (rev 2355)
@@ -5,6 +5,8 @@
ant
to run a single test:
ant one -Dtest=test where test is for example Test_Chunk_JBWEB_117
+ to run just the test (without httpd installation)
+ ant tests
3 - JBW listener:
to test the JBW cluster listener use -Dcluster=false for example:
ant one -Dtest=Test_Chunk_JBWEB_117 -Dcluster=false
15 years, 9 months
JBoss Native SVN: r2354 - trunk/mod_cluster/test/java/org/jboss/mod_cluster.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 08:58:37 -0400 (Thu, 12 Mar 2009)
New Revision: 2354
Modified:
trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java
Log:
return false if it fails.
Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java
===================================================================
--- trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java 2009-03-12 11:13:41 UTC (rev 2353)
+++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/Maintest.java 2009-03-12 12:58:37 UTC (rev 2354)
@@ -212,13 +212,15 @@
}
return true;
}
- public static void testPort(int port) {
+ public static boolean testPort(int port) {
+ boolean ret = true;
Socket s = null;
try {
s = new Socket("localhost", port);
s.setSoLinger(true, 0);
} catch (Exception e) {
System.out.println("Can't connect to " + port);
+ ret = false;
} finally {
if (s != null) {
System.out.println("Was connected to " + port);
@@ -228,6 +230,7 @@
}
}
}
+ return ret;
}
static boolean TestForNodes(LifecycleListener lifecycle, String [] nodes) {
int countinfo = 0;
15 years, 9 months
JBoss Native SVN: r2353 - trunk/mod_cluster/test/java/org/jboss/mod_cluster.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 07:13:41 -0400 (Thu, 12 Mar 2009)
New Revision: 2353
Modified:
trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java
Log:
Make sure the stopped connector is not answering.
Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java
===================================================================
--- trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java 2009-03-12 09:58:27 UTC (rev 2352)
+++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java 2009-03-12 11:13:41 UTC (rev 2353)
@@ -124,6 +124,15 @@
ex.printStackTrace();
fail("can't stop connector");
}
+ /* wait until the connector has stopped */
+ while (Maintest.testPort(port) && countinfo < 20) {
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ }
+ countinfo++;
+ }
}
// Run a test on it. (it waits until httpd as received the nodes information).
15 years, 9 months
JBoss Native SVN: r2352 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 05:58:27 -0400 (Thu, 12 Mar 2009)
New Revision: 2352
Modified:
trunk/mod_cluster/test/java/installhttpd.sh
Log:
Don't remove the file but download it if it doesn't exist...
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-03-12 09:25:13 UTC (rev 2351)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-03-12 09:58:27 UTC (rev 2352)
@@ -154,8 +154,13 @@
else
if [ "x${BUILDTEST}" = "xN" ]
then
- rm -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
- ant downloadfile -Dsourcefile=${TARBALL} -Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"
+ # rm -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
+ if [ ! -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ]
+ then
+ ant downloadfile -Dsourcefile=${TARBALL} -Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"
+ else
+ echo "Warning the file ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} is reused"
+ fi
else
echo "Using $root"
EXT=file
15 years, 9 months
JBoss Native SVN: r2351 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 05:25:13 -0400 (Thu, 12 Mar 2009)
New Revision: 2351
Modified:
trunk/mod_cluster/test/java/installhttpd.sh
Log:
Typo...
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-03-12 09:13:30 UTC (rev 2350)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-03-12 09:25:13 UTC (rev 2351)
@@ -152,7 +152,7 @@
fi
fi
else
- if [ "x${BUILDTEST}" = "N" ]
+ if [ "x${BUILDTEST}" = "xN" ]
then
rm -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
ant downloadfile -Dsourcefile=${TARBALL} -Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"
15 years, 9 months
JBoss Native SVN: r2350 - trunk/mod_cluster/test/java/org/jboss/mod_cluster.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-12 05:13:30 -0400 (Thu, 12 Mar 2009)
New Revision: 2350
Modified:
trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java
Log:
Stop it early in case of client error.
Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java
===================================================================
--- trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java 2009-03-09 17:01:22 UTC (rev 2349)
+++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestStickyForce.java 2009-03-12 09:13:30 UTC (rev 2350)
@@ -103,6 +103,8 @@
ex.printStackTrace();
clienterror = true;
}
+ if (clienterror)
+ fail("Client error");
// Stop the connector that has received the request...
String node = client.getnode();
@@ -124,9 +126,6 @@
}
}
- if (clienterror)
- fail("Client error");
-
// Run a test on it. (it waits until httpd as received the nodes information).
client.setnode(node);
try {
15 years, 9 months
JBoss Native SVN: r2349 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-09 13:01:22 -0400 (Mon, 09 Mar 2009)
New Revision: 2349
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Seems too late on windoze :-(
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-03-09 13:54:16 UTC (rev 2348)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-03-09 17:01:22 UTC (rev 2349)
@@ -1853,7 +1853,7 @@
APR_HOOK_FIRST);
/* Process the request from the ModClusterService */
- ap_hook_handler(manager_handler, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_handler(manager_handler, NULL, NULL, APR_HOOK_FIRST);
/* Register nodes/hosts/contexts table provider */
ap_register_provider(p, "manager" , "shared", "0", &node_storage);
15 years, 9 months
JBoss Native SVN: r2348 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-03-09 09:54:16 -0400 (Mon, 09 Mar 2009)
New Revision: 2348
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Solaris doesn't have a gnu tar.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2009-03-09 12:40:39 UTC (rev 2347)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2009-03-09 13:54:16 UTC (rev 2348)
@@ -245,7 +245,7 @@
)
done
(cd ../mod_cluster/target
- tar zcf ${build_top}/output/${PACKAGE}-${build_version}-${BUILD_SYS}-${BUILD_CPU}-so.tar.gz *.so
+ tar -zf - *.so | gzip -c > ${build_top}/output/${PACKAGE}-${build_version}-${BUILD_SYS}-${BUILD_CPU}-so.tar.gz
)
fi
15 years, 9 months