xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1373: Update jvm startup to load a service list for services to start.

Browse source 
Former-commit-id: af5b616282 [formerly 1c560f5013] [formerly c1765f776c [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]
Former-commit-id: c1765f776c
Former-commit-id: 424cb12ef6
This commit is contained in:
Richard Peter 2013-01-03 15:53:02 -06:00
parent 0102bdc392
commit 9f991104dd
8 changed files with 180 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
edexOsgi/build.edex/esb/conf/log4j-datadelivery.xml
View file

@ -1,156 +0,0 @@
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<!-- general application log -->
<appender name="console" class="org.apache.log4j.ConsoleAppender">
<param name="Threshold" value="INFO" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<!-- harvester log -->
<appender name="HarvesterLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-harvester-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<!-- BandwidthManager log -->
<appender name="BandwidthManagerLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-bandwidth-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<!-- registry log -->
<appender name="RegistryLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-registry-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<!-- Purge log -->
<appender name="PurgeLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-purge-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<appender name="ThreadBasedLog" class="com.raytheon.uf.edex.log.ThreadBasedAppender">
<param name="ThreadPatterns" value="HarvesterLog:harvesterThreadPool.*,crawlerThreadPool.*,Crawler.*"/>
<param name="DefaultAppender" value="console"/>
<appender-ref ref="console"/>
<appender-ref ref="HarvesterLog"/>
</appender>
<logger name="com.raytheon">
<level value="INFO"/>
</logger>
<!-- used by c3p0 -->
<logger name="com.mchange">
<level value="ERROR"/>
</logger>
<logger name="com.tc">
<level value="WARN"/>
</logger>
<logger name="mx4j">
<level value="ERROR"/>
</logger>
<logger name="org.apache">
<level value="INFO"/>
</logger>
<logger name="org.apache.activemq.spring">
<level value="WARN"/>
</logger>
<logger name="org.apache.camel.impl.converter.DefaultTypeConverter">
<level value="ERROR"/>
</logger>
<logger name="org.apache.qpid">
<level value="INFO"/>
</logger>
<logger name="org.apache.qpid.client.BasicMessageProducer_0_10">
<level value="WARN"/>
</logger>
<logger name="org.apache.xbean.spring">
<level value="WARN"/>
</logger>
<logger name="org.jgroup">
<level value="ERROR"/>
</logger>
<logger name="org.quartz">
<level value="ERROR"/>
</logger>
<logger name="org.springframework">
<level value="ERROR"/>
</logger>
<logger name="uk.ltd.getahead">
<level value="WARN"/>
</logger>
<logger name="org.hibernate">
<level value="ERROR"/>
</logger>
<logger name="org.geotools">
<level value="WARN"/>
</logger>
<logger name="edu">
<level value="WARN" />
</logger>
<logger name="com.raytheon.uf.common.datadelivery.registry" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.common.registry" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.edex.registry" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.common.datadelivery.bandwidth" additivity="false">
<level value="INFO"/>
<appender-ref ref="BandwidthManagerLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.bandwidth" additivity="false">
<level value="INFO"/>
<appender-ref ref="BandwidthManagerLog"/>
</logger>
<logger name="com.raytheon.uf.edex.ebxml" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.harvester.purge" additivity="false">
<level value="INFO"/>
<appender-ref ref="PurgeLog"/>
</logger>
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="ThreadBasedLog"/>
</root>
</log4j:configuration>

88
edexOsgi/build.edex/esb/conf/log4j-registry.xml
View file

@ -8,6 +8,57 @@
</layout>
</appender>
<!-- harvester log -->
<appender name="HarvesterLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-harvester-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<!-- BandwidthManager log -->
<appender name="BandwidthManagerLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-bandwidth-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<!-- registry log -->
<appender name="RegistryLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-registry-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<!-- Purge log -->
<appender name="PurgeLog" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
<param name="FileNamePattern" value="${edex.home}/logs/edex-${edex.run.mode}-purge-%d{yyyyMMdd}.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/>
</layout>
</appender>
<appender name="ThreadBasedLog" class="com.raytheon.uf.edex.log.ThreadBasedAppender">
<param name="ThreadPatterns" value="HarvesterLog:harvesterThreadPool.*,crawlerThreadPool.*,Crawler.*"/>
<param name="DefaultAppender" value="console"/>
<appender-ref ref="console"/>
<appender-ref ref="HarvesterLog"/>
</appender>
<logger name="com.raytheon">
<level value="INFO"/>
</logger>
@ -62,9 +113,44 @@
<level value="WARN" />
</logger>
<logger name="com.raytheon.uf.common.datadelivery.registry" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.common.registry" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.edex.registry" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.common.datadelivery.bandwidth" additivity="false">
<level value="INFO"/>
<appender-ref ref="BandwidthManagerLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.bandwidth" additivity="false">
<level value="INFO"/>
<appender-ref ref="BandwidthManagerLog"/>
</logger>
<logger name="com.raytheon.uf.edex.ebxml" additivity="false">
<level value="INFO"/>
<appender-ref ref="RegistryLog"/>
</logger>
<logger name="com.raytheon.uf.edex.datadelivery.harvester.purge" additivity="false">
<level value="INFO"/>
<appender-ref ref="PurgeLog"/>
</logger>
<!-- default logging -->
<root>
<level value="INFO"/>
<appender-ref ref="console"/>
<appender-ref ref="ThreadBasedLog"/>
</root>
</log4j:configuration>

145
edexOsgi/build.edex/esb/conf/modes.xml
View file

@ -77,48 +77,6 @@
<exclude>purgeutil-request.xml</exclude>
<!-- end of ncep excludes -->
</mode>
<mode name="registry">
<include>ebxml.*\.xml</include>
<includeMode>statsTemplate</includeMode>
</mode>
<mode name="datadelivery">
<includeMode>registry</includeMode>
<includeMode>datadeliverytemplate</includeMode>
<!--
The pattern datadelivery-registry is used to signify spring configurations
that should be loaded when running datadelivery and the registry in a single JVM
-->
<include>.*datadelivery-registry.*</include>
<!--
The pattern datadelivery-standalone is used to signify spring configurations
that should be loaded when running datadelivery with the registry in a separate JVM
-->
<exclude>.*datadelivery-standalone.*</exclude>
</mode>
<mode name="dataprovideragent">
<include>manualIngest*</include>
<include>time-common.xml</include>
<include>distribution-spring.xml</include>
<include>persist-ingest.xml</include>
<include>auth-common.xml</include>
<!-- grid specific services -->
<include>grib-common.xml</include>
<include>grid-staticdata-process.xml</include>
<include>gridcoverage-.*.xml</include>
<include>grib-distribution.xml</include>
<include>grib-datadelivery.xml</include>
<include>level-common.xml</include>
<!-- pointdata/obs specific services -->
<include>pointdata-common.xml</include>
<include>obs-common.xml</include>
<include>obs-datadelivery.xml</include>
<!-- dpa services -->
<include>.*dpa.*</include>
<!-- OGC services -->
<include>.*ogc.*</include>
<!-- excluded services -->
<exclude>fssobs-common</exclude>
</mode>
<mode name="ingest">
<exclude>ebxml.*\.xml</exclude>
<exclude>.*request.*</exclude>
@ -222,6 +180,54 @@
<includeMode>excludeDpaAndOgc</includeMode>
<includeMode>statsTemplate</includeMode>
</mode>
<mode name="registry">
<include>ebxml.*\.xml</include>
<includeMode>statsTemplate</includeMode>
<includeMode>dataDeliveryTemplate</includeMode>
</mode>
<mode name="statsTemplate" template="true">
<include>event-common.xml</include>
<include>stats-common.xml</include>
</mode>
<mode name="dataDeliveryTemplate" template="true">
<include>database-common.xml</include>
<include>.*datadelivery.*</include>
<include>.*bandwidth.*</include>
<!-- Exclude the inmemory versions of Spring files -->
<exclude>.*bandwidth.*-inmemory.*.xml</exclude>
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>nwsauth-request.xml</include>
<include>grid-staticdata-process.xml</include>
<include>grid-common.xml</include>
<include>gridcoverage-.*.xml</include>
<include>parameter-common.xml</include>
<include>pointdata-common.xml</include>
<include>obs-common.xml</include>
<include>level-common.xml</include>
<include>persist-ingest.xml</include>
<include>management-common.xml</include>
<include>event-ingest.xml</include>
<!--
The pattern datadelivery-registry is used to signify spring configurations
that should be loaded when running datadelivery and the registry in a single JVM
-->
<include>.*datadelivery-registry.*</include>
<!--
The pattern datadelivery-standalone is used to signify spring configurations
that should be loaded when running datadelivery with the registry in a separate JVM
-->
<exclude>.*datadelivery-standalone.*</exclude>
<includeMode>statsTemplate</includeMode>
</mode>
<mode name="excludeDpaAndOgc" template="true">
<!-- exclude dpa services -->
<exclude>.*dpa.*</exclude>
<!-- exclude OGC services -->
<exclude>.*ogc.*</exclude>
</mode>
<!-- modes listed below are not supported in a production setting, they
are for DEVELOPMENT purposes only -->
@ -280,35 +286,28 @@
<exclude>.*datadelivery-registry.*</exclude>
<includeMode>datadeliverytemplate</includeMode>
</mode>
<mode name="statsTemplate" template="true">
<include>event-common.xml</include>
<include>stats-common.xml</include>
</mode>
<mode name="datadeliverytemplate" template="true">
<include>database-common.xml</include>
<include>.*datadelivery.*</include>
<include>.*bandwidth.*</include>
<!-- Exclude the inmemory versions of Spring files -->
<exclude>.*bandwidth.*-inmemory.*.xml</exclude>
<include>time-common.xml</include>
<include>auth-common.xml</include>
<include>nwsauth-request.xml</include>
<include>grid-staticdata-process.xml</include>
<include>grid-common.xml</include>
<include>gridcoverage-.*.xml</include>
<include>parameter-common.xml</include>
<include>pointdata-common.xml</include>
<include>obs-common.xml</include>
<include>level-common.xml</include>
<include>persist-ingest.xml</include>
<include>management-common.xml</include>
<include>event-ingest.xml</include>
<includeMode>statsTemplate</includeMode>
</mode>
<mode name="excludeDpaAndOgc" template="true">
<!-- exclude dpa services -->
<exclude>.*dpa.*</exclude>
<!-- exclude OGC services -->
<exclude>.*ogc.*</exclude>
</mode>
<mode name="dataprovideragent">
<include>manualIngest*</include>
<include>time-common.xml</include>
<include>distribution-spring.xml</include>
<include>persist-ingest.xml</include>
<include>auth-common.xml</include>
<!-- grid specific services -->
<include>grib-common.xml</include>
<include>grid-staticdata-process.xml</include>
<include>gridcoverage-.*.xml</include>
<include>grib-distribution.xml</include>
<include>grib-datadelivery.xml</include>
<include>level-common.xml</include>
<!-- pointdata/obs specific services -->
<include>pointdata-common.xml</include>
<include>obs-common.xml</include>
<include>obs-datadelivery.xml</include>
<!-- dpa services -->
<include>.*dpa.*</include>
<!-- OGC services -->
<include>.*ogc.*</include>
<!-- excluded services -->
<exclude>fssobs-common</exclude>
</mode>
</edexModes>

34
edexOsgi/build.edex/esb/etc/datadelivery.sh
View file

@ -1,34 +0,0 @@
#!/bin/bash
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
export INIT_MEM=512 # in Meg
if [ $HIGH_MEM_FLAG == "on" ]; then
export MAX_MEM=1536 # in Meg
else
export MAX_MEM=896 # in Meg
fi
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5009
export EDEX_JMX_PORT=1620
export LOG4J_CONF=log4j-datadelivery.xml
export MGMT_PORT=9605

14
edexOsgi/build.edex/esb/etc/registry.sh
View file

@ -19,16 +19,10 @@
# further licensing information.
##
export INIT_MEM=512 # in Meg
if [ $HIGH_MEM_FLAG == "on" ]; then
export MAX_MEM=1536 # in Meg
else
export MAX_MEM=896 # in Meg
fi
export MAX_MEM=1536 # in Meg
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5011
export EDEX_JMX_PORT=1622
export EDEX_DEBUG_PORT=5009
export EDEX_JMX_PORT=1620
export LOG4J_CONF=log4j-registry.xml
export MGMT_PORT=9607
export MGMT_PORT=9605

5
rpms/awips2.edex/Installer.edex-base/scripts/init.d/edexServiceList Normal file
View file

@ -0,0 +1,5 @@
#!/bin/bash
# Default Services to start
export SERVICES=( 'request' 'ingest' 'ingestGrib' 'ingestDat')

14
rpms/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel
View file

@ -29,12 +29,12 @@ if [ $TOTAL_MEM -gt 4 ]; then
HIGH_MEM=on
fi
# Default Services to start
SERVICES=('ingest' 'ingestGrib' 'request' 'datadelivery')
if [ $HIGH_MEM == "on" ]; then
SERVICES=('ingest' 'ingestGrib' 'ingestDat' 'request' 'datadelivery')
fi
# determine services to load
if [ -f /etc/rc.d/init.d/edexServiceList ]; then
. /etc/rc.d/init.d/edexServiceList
else
SERVICES=( 'request' 'ingest' 'ingestGrib' 'ingestDat')
fi
# Who to run EDEX server as, usually "awips". (NOT "root")
EDEXUSER=awips
@ -200,4 +200,4 @@ case $func in
;;
esac
exit $RETVAL
exit $RETVAL

5
rpms/awips2.edex/Installer.edex-datadelivery/edexServiceList Normal file
View file

@ -0,0 +1,5 @@
#!/bin/bash
# Default Services to start
export SERVICES=('registry')