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

ReferrerPushStrategy logging changes

This commit is contained in:
Thomas Becker 2013-07-23 14:34:46 +02:00
parent 3b7322f53b
commit 1c546a90d6
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java
View File

@ -40,23 +40,23 @@ import org.eclipse.jetty.util.log.Logger;
/** /**
* <p>A SPDY push strategy that auto-populates push metadata based on referrer URLs.<p>A typical request for a main * <p>A SPDY push strategy that auto-populates push metadata based on referrer URLs.<p>A typical request for a main
* resource such as {@code index.html} is immediately followed by a number of requests for associated resources. * resource such as {@code index.html} is immediately followed by a number of requests for associated resources.
* Associated resource requests will have a {@code Referer} HTTP header that points to {@code index.html}, which is * Associated resource requests will have a {@code Referer} HTTP header that points to {@code index.html}, which is used
* used to link the associated resource to the main resource.<p>However, also following a hyperlink generates a * to link the associated resource to the main resource.<p>However, also following a hyperlink generates a HTTP request
* HTTP request with a {@code Referer} HTTP header that points to {@code index.html}; therefore a proper value for * with a {@code Referer} HTTP header that points to {@code index.html}; therefore a proper value for {@link
* {@link #setReferrerPushPeriod(int)} has to be set. If the referrerPushPeriod for a main resource has elapsed, * #setReferrerPushPeriod(int)} has to be set. If the referrerPushPeriod for a main resource has elapsed, no more
* no more associated resources will be added for that main resource.<p>This class distinguishes associated main * associated resources will be added for that main resource.<p>This class distinguishes associated main resources by
* resources by their URL path suffix and content type. CSS stylesheets, images and JavaScript files have * their URL path suffix and content type. CSS stylesheets, images and JavaScript files have recognizable URL path
* recognizable URL path suffixes that are classified as associated resources. The suffix regexs can be configured by * suffixes that are classified as associated resources. The suffix regexs can be configured by constructor argument</p>
* constructor argument</p>
* <p>When CSS stylesheets refer to images, the CSS image request will have the CSS stylesheet as referrer. This * <p>When CSS stylesheets refer to images, the CSS image request will have the CSS stylesheet as referrer. This
* implementation will push also the CSS image.<p>The push metadata built by this implementation is limited by the * implementation will push also the CSS image.<p>The push metadata built by this implementation is limited by the
* number of pages of the application itself, and by the {@link #setMaxAssociatedResources(int)} max associated resources} * number of pages of the application itself, and by the {@link #setMaxAssociatedResources(int)} max associated
* parameter. This parameter limits the number of associated resources per each main resource, so that if a main * resources} parameter. This parameter limits the number of associated resources per each main resource, so that if a
* resource has hundreds of associated resources, only up to the number specified by this parameter will be pushed. * main resource has hundreds of associated resources, only up to the number specified by this parameter will be
* pushed.
*/ */
public class ReferrerPushStrategy implements PushStrategy public class ReferrerPushStrategy implements PushStrategy
{ {
private static final Logger logger = Log.getLogger(ReferrerPushStrategy.class); private static final Logger LOG = Log.getLogger(ReferrerPushStrategy.class);
private final ConcurrentMap<String, MainResource> mainResources = new ConcurrentHashMap<>(); private final ConcurrentMap<String, MainResource> mainResources = new ConcurrentHashMap<>();
private final Set<Pattern> pushRegexps = new HashSet<>(); private final Set<Pattern> pushRegexps = new HashSet<>();
private final Set<String> pushContentTypes = new HashSet<>(); private final Set<String> pushContentTypes = new HashSet<>();
@ -166,7 +166,7 @@ public class ReferrerPushStrategy implements PushStrategy
String origin = scheme + "://" + host; String origin = scheme + "://" + host;
String url = requestHeaders.get(HTTPSPDYHeader.URI.name(version)).value(); String url = requestHeaders.get(HTTPSPDYHeader.URI.name(version)).value();
String absoluteURL = origin + url; String absoluteURL = origin + url;
logger.debug("Applying push strategy for {}", absoluteURL); LOG.debug("Applying push strategy for {}", absoluteURL);
if (isMainResource(url, responseHeaders)) if (isMainResource(url, responseHeaders))
{ {
MainResource mainResource = getOrCreateMainResource(absoluteURL); MainResource mainResource = getOrCreateMainResource(absoluteURL);
@ -189,7 +189,7 @@ public class ReferrerPushStrategy implements PushStrategy
result = getPushResources(absoluteURL); result = getPushResources(absoluteURL);
} }
} }
logger.debug("Pushing {} resources for {}: {}", result.size(), absoluteURL, result); LOG.debug("Pushing {} resources for {}: {}", result.size(), absoluteURL, result);
} }
return result; return result;
} }
@ -207,7 +207,7 @@ public class ReferrerPushStrategy implements PushStrategy
MainResource mainResource = mainResources.get(absoluteURL); MainResource mainResource = mainResources.get(absoluteURL);
if (mainResource == null) if (mainResource == null)
{ {
logger.debug("Creating new main resource for {}", absoluteURL); LOG.debug("Creating new main resource for {}", absoluteURL);
MainResource value = new MainResource(absoluteURL); MainResource value = new MainResource(absoluteURL);
mainResource = mainResources.putIfAbsent(absoluteURL, value); mainResource = mainResources.putIfAbsent(absoluteURL, value);
if (mainResource == null) if (mainResource == null)
@ -282,7 +282,7 @@ public class ReferrerPushStrategy implements PushStrategy
long delay = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - firstResourceAdded.get()); long delay = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - firstResourceAdded.get());
if (!referrer.startsWith(origin) && !isPushOriginAllowed(origin)) if (!referrer.startsWith(origin) && !isPushOriginAllowed(origin))
{ {
logger.debug("Skipped store of push metadata {} for {}: Origin: {} doesn't match or origin not allowed", LOG.debug("Skipped store of push metadata {} for {}: Origin: {} doesn't match or origin not allowed",
url, name, origin); url, name, origin);
return false; return false;
} }
@ -292,17 +292,18 @@ public class ReferrerPushStrategy implements PushStrategy
// although in rare cases few more resources will be stored // although in rare cases few more resources will be stored
if (resources.size() >= maxAssociatedResources) if (resources.size() >= maxAssociatedResources)
{ {
logger.debug("Skipped store of push metadata {} for {}: max associated resources ({}) reached", LOG.debug("Skipped store of push metadata {} for {}: max associated resources ({}) reached",
url, name, maxAssociatedResources); url, name, maxAssociatedResources);
return false; return false;
} }
if (delay > referrerPushPeriod) if (delay > referrerPushPeriod)
{ {
logger.debug("Delay: {}ms longer than referrerPushPeriod: {}ms. Not adding resource: {} for: {}", delay, referrerPushPeriod, url, name); LOG.debug("Delay: {}ms longer than referrerPushPeriod ({}ms). Not adding resource: {} for: {}", delay,
referrerPushPeriod, url, name);
return false; return false;
} }
logger.debug("Adding resource: {} for: {} with delay: {}ms.", url, name, delay); LOG.debug("Adding: {} to: {} with delay: {}ms.", url, this, delay);
resources.add(url); resources.add(url);
return true; return true;
} }
@ -314,7 +315,12 @@ public class ReferrerPushStrategy implements PushStrategy
public String toString() public String toString()
{ {
return "MainResource: " + name + " associated resources:" + resources.size(); return String.format("%s@%x{name=%s,resources=%s}",
getClass().getSimpleName(),
hashCode(),
name,
resources
);
} }
private boolean isPushOriginAllowed(String origin) private boolean isPushOriginAllowed(String origin)