Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1200 Update deployment manager to use PathWatcher 

Updated PathWatcher to use IncludeExcludeSet
This commit is contained in:
Greg Wilkins 2017-08-24 10:01:51 +10:00
parent 578afa0f5e
commit a947122235
2 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java
View File

@ -39,6 +39,7 @@ import java.nio.file.WatchEvent.Kind;
import java.nio.file.WatchKey;
import java.nio.file.WatchService;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EventListener;
@ -50,8 +51,10 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
@ -85,16 +88,19 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
}
protected final Path dir;
protected final IncludeExcludeSet<PathMatcher,Path> includeExclude;
protected int recurseDepth = 0; // 0 means no sub-directories are scanned
protected List<PathMatcher> includes;
protected List<PathMatcher> excludes;
protected boolean excludeHidden = false;
public Config(Path path)
{
this(path,new IncludeExcludeSet<>(PathMatcherSet.class));
}
public Config(Path path, IncludeExcludeSet<PathMatcher,Path> includeExclude)
{
this.dir = path;
includes = new ArrayList<>();
excludes = new ArrayList<>();
this.includeExclude = includeExclude;
}
/**
@ -105,7 +111,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
*/
public void addExclude(PathMatcher matcher)
{
this.excludes.add(matcher);
includeExclude.exclude(matcher);
}
/**
@ -189,7 +195,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
*/
public void addInclude(PathMatcher matcher)
{
this.includes.add(matcher);
includeExclude.include(matcher);
}
/**
@ -256,9 +262,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
*/
public Config asSubConfig(Path dir)
{
Config subconfig = new Config(dir);
subconfig.includes = this.includes;
subconfig.excludes = this.excludes;
Config subconfig = new Config(dir,includeExclude);
if (dir == this.dir)
subconfig.recurseDepth = this.recurseDepth; // TODO shouldn't really do a subconfig for this
else
@ -286,18 +290,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return this.dir;
}
private boolean hasMatch(Path path, List<PathMatcher> matchers)
{
for (PathMatcher matcher : matchers)
{
if (matcher.matches(path))
{
return true;
}
}
return false;
}
@Deprecated
public boolean isExcluded(Path dir) throws IOException
{
if (excludeHidden)
@ -312,13 +305,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
}
}
if (excludes.isEmpty())
{
// no excludes == everything allowed
return false;
}
boolean matched = hasMatch(dir,excludes);
boolean matched = ((PathMatcherSet)includeExclude.getExcluded()).test(dir);
if (NOISY_LOG.isDebugEnabled())
{
NOISY_LOG.debug("isExcluded [{}] on {}",matched,dir);
@ -326,19 +313,10 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
return matched;
}
@Deprecated
public boolean isIncluded(Path dir)
{
if (includes.isEmpty())
{
// no includes == everything allowed
if (NOISY_LOG.isDebugEnabled())
{
NOISY_LOG.debug("isIncluded [All] on {}",dir);
}
return true;
}
boolean matched = hasMatch(dir,includes);
boolean matched = ((PathMatcherSet)includeExclude.getIncluded()).test(dir);
if (NOISY_LOG.isDebugEnabled())
{
NOISY_LOG.debug("isIncluded [{}] on {}",matched,dir);
@ -348,15 +326,7 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
public boolean matches(Path path)
{
try
{
return !isExcluded(path) && isIncluded(path);
}
catch (IOException e)
{
LOG.warn("Unable to match path: " + path,e);
return false;
}
return includeExclude.test(path);
}
/**
@ -1453,4 +1423,17 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
appendConfigId(s);
return s.toString();
}
public static class PathMatcherSet extends HashSet<PathMatcher> implements Predicate<Path>
{
@Override
public boolean test(Path path)
{
for (PathMatcher pm: this)
if (pm.matches(path))
return true;
return false;
}
}
}

14
jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java
View File

@ -273,13 +273,16 @@ public class PathWatcherTest
*/
private static void awaitQuietTime(PathWatcher pathWatcher) throws InterruptedException
{
double multiplier = 5.0;
long offset = 1000;
double multiplier = 3.0;
if (OS.IS_WINDOWS)
{
// Microsoft Windows filesystem is too slow for a lower multiplier
multiplier = 6.0;
offset = 1500;
multiplier = 4.0;
}
TimeUnit.MILLISECONDS.sleep((long)((double)pathWatcher.getUpdateQuietTimeMillis() * multiplier));
long wait = offset + (long)((double)pathWatcher.getUpdateQuietTimeMillis() * multiplier);
TimeUnit.MILLISECONDS.sleep(wait);
}
private static final int KB = 1024;
@ -393,7 +396,8 @@ public class PathWatcherTest
expected.put("a.txt",new PathWatchEventType[] {ADDED});
expected.put("b.txt",new PathWatchEventType[] {ADDED});
Thread.currentThread().sleep(1000); // TODO poor test
capture.assertEvents(expected);
//stop it
@ -401,7 +405,7 @@ public class PathWatcherTest
capture.reset();
Thread.currentThread().sleep(1000);
Thread.currentThread().sleep(1000); // TODO poor test
pathWatcher.start();