SF.net SVN: moduleforge:[2306] controltier/branches/controltier-3-4-support

[mose...@users.sourceforge.net]

Revision: 2306
http://moduleforge.svn.sourceforge.net/moduleforge/?rev=2306&view=rev
Author: moseslei
Date: 2011-12-06 06:58:59 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Change timestamp format of JBoss logs (JBossServer#startService); add generic startup message checking to JBossServer#waitforStartEvent; add Nucleus running startup message to AtgJBossServer

Modified Paths:
--------------
controltier/branches/controltier-3-4-support/atg/modules/AtgJBossServer/type.xml
controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/startService.xml
controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/waitforStartEvent.xml

Modified: controltier/branches/controltier-3-4-support/atg/modules/AtgJBossServer/type.xml
===================================================================
--- controltier/branches/controltier-3-4-support/atg/modules/AtgJBossServer/type.xml 2011-12-01 18:08:13 UTC (rev 2305)
+++ controltier/branches/controltier-3-4-support/atg/modules/AtgJBossServer/type.xml 2011-12-06 06:58:59 UTC (rev 2306)
@@ -467,6 +467,8 @@
<attribute-default name="jbossTomcatAjpConnectionTimeout" value="600000"/>
<attribute-default name="jbossTomcatAjpEnableLookups" value="false"/>
<attribute-default name="jbossTomcatAdditionalValves" value=""/>
+
+ <attribute-default name="verifystartregex" value="Nucleus running, app server startup continuing"/>
</attributes>
<constraints>
<dependency-constraint enforced="false" kind="parent">

Modified: controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/startService.xml
===================================================================
--- controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/startService.xml 2011-12-01 18:08:13 UTC (rev 2305)
+++ controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/startService.xml 2011-12-06 06:58:59 UTC (rev 2306)
@@ -52,7 +52,7 @@
<available file="${server.log}"/>
<then>
<tstamp>
- <format property="FSTAMP" pattern="dd-MMM-HH-mm-ss"/>
+ <format property="FSTAMP" pattern="yyyy-MM-dd-HHmmss"/>
</tstamp>
<move file="${server.log}" tofile="${server.log}.${FSTAMP}"/>
</then>

Modified: controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/waitforStartEvent.xml
===================================================================
--- controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/waitforStartEvent.xml 2011-12-01 18:08:13 UTC (rev 2305)
+++ controltier/branches/controltier-3-4-support/elements/modules/JBossServer/commands/waitforStartEvent.xml 2011-12-06 06:58:59 UTC (rev 2306)
@@ -31,6 +31,27 @@
<fail if="timeout" message="timed out after ${opts.maxwait} seconds waiting for '${server.startup.regex}' in ${server.log}"/>
</action>
<action name="success">
+ <!-- this check only implemented on unix -->
+ <if>
+ <and>
+ <isset property="entity.attribute.verifystartregex"/>
+ <os family="unix"/>
+ </and>
+ <then>
+ <exec executable="grep" failonerror="false" resultproperty="temp.grep.result">
+ <arg value="${entity.attribute.verifystartregex}"/>
+ <arg value="${server.log}"/>
+ </exec>
+ <if>
+ <not>
+ <equals arg1="${temp.grep.result}" arg2="0"/>
+ </not>
+ <then>
+ <fail message="Could not find '${entity.attribute.verifystartregex}' in ${server.log} (grep failed with status ${temp.grep.result})"/>
+ </then>
+ </if>
+ </then>
+ </if>
<echo level="info">Startup complete according to ${server.log}</echo>
</action>
</handleractions>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.