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

Issue #2469 Fixed default rules implementation

Browse source 
Former-commit-id: d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]]
Former-commit-id: 45413d0db4
Former-commit-id: 05c81677d2 [formerly dc97eb7890] [formerly 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76 [formerly ff5a5961db]]
Former-commit-id: ca019feb8178be88e796a82d279fda02bcfa070a [formerly 8a924bcc2c]
Former-commit-id: e030ac65b2
This commit is contained in:
Dave Hladky 2014-02-24 13:06:52 -06:00
parent 15edb8e522
commit 2ed6aabcb0
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/resources/com.raytheon.uf.edex.datadelivery.retrieval.properties
View file

@ -15,6 +15,8 @@ subnotify.task.frequency=1 MINUTES
checkExpiredSubscription.cron=0+2+*+*+*+? checkExpiredSubscription.cron=0+2+*+*+*+?
# Cron for subscriptions nearing the end of their active period - currently once/day at 00:15Z # Cron for subscriptions nearing the end of their active period - currently once/day at 00:15Z
checkEndingSubscription.cron=0+15+0+*+*+? checkEndingSubscription.cron=0+15+0+*+*+?
# The period which adhoc subscriptions are cleaned, every 20 mins
adhocsubscription-process.cron=0+0/20+*+*+*+?
# How many retrieval queue consumers # How many retrieval queue consumers
retrieval-process.threads=4 retrieval-process.threads=4
# How many subNotify threads for retrieval # How many subNotify threads for retrieval

10
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/adhoc/AdhocSubscriptionCleaner.java
View file

@ -53,6 +53,7 @@ import com.raytheon.uf.edex.database.purge.PurgeRuleSet;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Oct 11, 2013 2460 dhladky Initial creation * Oct 11, 2013 2460 dhladky Initial creation
* Oct 23, 2013 2469 dhladky Refined the time check and accommodation for lack of purge rules. * Oct 23, 2013 2469 dhladky Refined the time check and accommodation for lack of purge rules.
* Feb 24, 2014 2469 dhladky Added check to add in default rules when regular rules don't exist.
* *
* </pre> * </pre>
* *
@ -75,8 +76,9 @@ public class AdhocSubscriptionCleaner {
* Cleans old adhoc subscriptions from the WFO registry. * Cleans old adhoc subscriptions from the WFO registry.
* Compares the end() time on the sub to the expiration period in * Compares the end() time on the sub to the expiration period in
* associated purge rules derived from the plugin each subs data * associated purge rules derived from the plugin each subs data
* is stored too. Runs on every 20 minutes. * is stored too. Runs on every 60 minutes.
*/ */
@SuppressWarnings("rawtypes")
public void processSubscriptions() { public void processSubscriptions() {
statusHandler.handle(Priority.INFO, "Processing Adhoc Subscriptions for expiration..."); statusHandler.handle(Priority.INFO, "Processing Adhoc Subscriptions for expiration...");
@ -153,7 +155,11 @@ public class AdhocSubscriptionCleaner {
if (purgeRuleSet != null) { if (purgeRuleSet != null) {
List<PurgeRule> rules = purgeRuleSet.getRules(); List<PurgeRule> rules = purgeRuleSet.getRules();
// if no rules exist, create a default, 12 hours // If no regular rules, try defaults.
if (rules.isEmpty()) {
rules = purgeRuleSet.getDefaultRules();
}
// if still no rules exist, create a default, 12 hours
if (rules.isEmpty()) { if (rules.isEmpty()) {
rules = new ArrayList<PurgeRule>(); rules = new ArrayList<PurgeRule>();
PurgeRule rule = new PurgeRule(); PurgeRule rule = new PurgeRule();

3
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
View file

@ -37,6 +37,8 @@
<property name="contextPath" value="/" /> <property name="contextPath" value="/" />
<property name="war" <property name="war"
value="file:///${edex.home}/webapps/registryEbxml" /> value="file:///${edex.home}/webapps/registryEbxml" />
<property name="systemClasses"
value="java., javax., org., com., gov., ch., net., edu."/>
</bean> </bean>
</list> </list>
</property> </property>
@ -48,5 +50,4 @@
</bean> </bean>
</property> </property>
</bean> </bean>
</beans> </beans>

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
View file

@ -2,8 +2,6 @@
ebxml-subscription-process.cron=0/20+*+*+*+*+? ebxml-subscription-process.cron=0/20+*+*+*+*+?
# The period which the registry runs the garbage collection # The period which the registry runs the garbage collection
ebxml-garbage-collect-process.cron=0+0/5+*+*+*+? ebxml-garbage-collect-process.cron=0+0/5+*+*+*+?
# The period which adhoc subscriptions are cleaned, every 20 mins
adhocsubscription-process.cron=0+0/20+*+*+*+?
# When a federation synchonization is necessary, this is the number of threads # When a federation synchonization is necessary, this is the number of threads
# that will be used for synchronization # that will be used for synchronization
ebxml-federation-sync-threads=3 ebxml-federation-sync-threads=3