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

Merge "Issue #2224 Add enable flag to archive purger and move properties to plug-in." into development

Browse source 
Former-commit-id: 1b9116908f [formerly cd84d89512] [formerly 6271bcc6c8] [formerly 1b9116908f [formerly cd84d89512] [formerly 6271bcc6c8] [formerly 9cb03c41af [formerly 6271bcc6c8 [formerly 56653b93813091d5eecb58ed5260eda110c76b89]]]]
Former-commit-id: 9cb03c41af
Former-commit-id: bc189b11cb [formerly 9cd4a377ee] [formerly 479d9696ad6301aa780817b20649b2f47d32cbe3 [formerly 85d3dc0567]]
Former-commit-id: dfe410bd65596097e436621ed8bf9b09218c2b84 [formerly 6416595e5b]
Former-commit-id: f600390495
This commit is contained in:
Richard Peter 2013-09-04 10:01:31 -05:00 • committed by Gerrit Code Review
commit 53e0ca54b2
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/build.edex/esb/conf/spring/cron.properties
View file

@ -12,10 +12,6 @@ qc.cron=0+2,7,12,17,22,27,32,37,42,47,52,57+*+*+*+?
acarssounding.cron=00+10,30,50+*+*+*+?
gfe.cron=0+15+*+*+*+?
repack.cron=0+20+*+*+*+?
# runs database and hdf5 archive for archive server to pull data from
archive.cron=0+40+*+*+*+?
# purge archives
archive.purge.cron=0+0+*+*+*+?
###purge configuration
# Interval at which the purge job kicks off

6
edexOsgi/com.raytheon.uf.edex.archive/resources/com.raytheon.uf.edex.archive.cron.properties Normal file
View file

@ -0,0 +1,6 @@
# runs database and hdf5 archive for archive server to pull data from
archive.cron=0+40+*+*+*+?
# purge archives
archive.purge.cron=0+5+*+*+*+?
# enable archive purge
archive.purge.enable=false

36
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
View file

@ -40,6 +40,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* Added info logging for purge counts.
* Aug 28, 2013 2299 rferrel manager.purgeExpiredFromArchive now returns
* number of files purged.
* Sep 03, 2013 2224 rferrel Add check to enable/disable purger.
*
* </pre>
*
@ -49,27 +50,34 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
public class ArchivePurger {
private final static IUFStatusHandler statusHandler = UFStatus
.getHandler(ArchiveConfigManager.class);
.getHandler(ArchivePurger.class);
private final static String ENABLE_PROPERTY = "archive.purge.enable";
/**
* Purge expired elements from the archives.
*/
public static void purge() {
ArchiveConfigManager manager = ArchiveConfigManager.getInstance();
Collection<ArchiveConfig> archives = manager.getArchives();
for (ArchiveConfig archive : archives) {
int purgeCount = manager.purgeExpiredFromArchive(archive);
if (statusHandler.isPriorityEnabled(Priority.INFO)) {
StringBuilder sb = new StringBuilder(archive.getName());
sb.append("::Archive Purged ");
sb.append(purgeCount);
sb.append(" file");
if (purgeCount != 1) {
sb.append("s");
String enableString = System.getProperty(ENABLE_PROPERTY, "false");
if (Boolean.parseBoolean(enableString)) {
statusHandler.info("::Archive Purged started.");
ArchiveConfigManager manager = ArchiveConfigManager.getInstance();
Collection<ArchiveConfig> archives = manager.getArchives();
for (ArchiveConfig archive : archives) {
int purgeCount = manager.purgeExpiredFromArchive(archive);
if (statusHandler.isPriorityEnabled(Priority.INFO)) {
StringBuilder sb = new StringBuilder(archive.getName());
sb.append("::Archive Purged ");
sb.append(purgeCount);
sb.append(" file");
if (purgeCount != 1) {
sb.append("s");
}
sb.append(".");
statusHandler.info(sb.toString());
}
sb.append(".");
statusHandler.info(sb.toString());
}
statusHandler.info("::Archive Purged finished.");
}
}
}