modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DirectoryAnalyzer.java | 8 +++++++- modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit e3ae4ca34a01dba6c4b3ef99d714ea2642be0657 Author: John Sanda jsanda@redhat.com Date: Wed Jul 6 16:39:17 2011 -0400
Ignore subdirectories when analyzing a directory for drift
Updating DrifDetectionSchedule so that it sets the interval by seconds and not minutes
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DirectoryAnalyzer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DirectoryAnalyzer.java index 5f20699..fa55085 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DirectoryAnalyzer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DirectoryAnalyzer.java @@ -1,6 +1,7 @@ package org.rhq.core.pc.drift;
import java.io.File; +import java.io.FileFilter; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -51,7 +52,12 @@ public class DirectoryAnalyzer { public void run() throws IOException { File dir = new File(basedir, dirEntry.getDirectory()); // TODO handle directories - Set<String> files = fileNames(dir.listFiles()); + Set<String> files = fileNames(dir.listFiles(new FileFilter() { + @Override + public boolean accept(File path) { + return path.isFile(); + } + })); Map<String, FileEntry> fileEntries = createFileEntriesMap(); List<String> processed = new ArrayList<String>();
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java index 0184782..a767b99 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java @@ -29,7 +29,7 @@ public class DriftDetectionSchedule implements Comparable<DriftDetectionSchedule }
public void updateShedule() { - nextScan = System.currentTimeMillis() + (driftConfig.getInterval() * 60 * 1000); + nextScan = System.currentTimeMillis() + (driftConfig.getInterval() * 1000); }
@Override