Index: main/workspace-site/src/org/ametys/web/site/IsPageCacheableAction.java =================================================================== --- main/workspace-site/src/org/ametys/web/site/IsPageCacheableAction.java (révision 10352) +++ main/workspace-site/src/org/ametys/web/site/IsPageCacheableAction.java (copie de travail) @@ -17,12 +17,16 @@ import java.util.Map; +import org.ametys.runtime.util.LoggerFactory; +import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.acting.ServiceableAction; +import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; +import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.SourceResolver; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceNotFoundException; @@ -40,6 +44,8 @@ /** The source resolver. */ protected SourceResolver _resolver; + private Logger _logger = LoggerFactory.getLoggerFor("site.cache.log"); + @Override public void service(ServiceManager serviceManager) throws ServiceException { @@ -57,6 +63,13 @@ String resourceURI = parameters.getParameter("uri", ""); + Request request = ObjectModelHelper.getRequest(objectModel); + String uniqueId = request.getHeader("UNIQUE_ID"); + StringBuilder builder = new StringBuilder(uniqueId); + builder.append(" - cacheable : "+cacheable); + + _logger.info(builder.toString()); + // If the page isn't cacheable, unlock and generate (return null). if (!cacheable) { Index: main/workspace-site/src/org/ametys/web/site/ResetSiteCacheAction.java =================================================================== --- main/workspace-site/src/org/ametys/web/site/ResetSiteCacheAction.java (révision 10352) +++ main/workspace-site/src/org/ametys/web/site/ResetSiteCacheAction.java (copie de travail) @@ -17,6 +17,8 @@ import java.util.Map; +import org.ametys.runtime.util.LoggerFactory; +import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; @@ -32,6 +34,7 @@ { private SiteCache _siteCache; private CacheAccessCounter _cacheAccessCounter; + private Logger _logger = LoggerFactory.getLoggerFor("site.cache.log"); @Override public void service(ServiceManager sManager) throws ServiceException @@ -44,16 +47,13 @@ @Override public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String source, Parameters parameters) throws Exception { - if (getLogger().isInfoEnabled()) + if (_logger.isInfoEnabled()) { - getLogger().info("Reset sites cache"); - } + _logger.info("Reset sites cache"); - int count = _cacheAccessCounter.getAskedResources(); - - if (getLogger().isInfoEnabled()) - { - getLogger().info("Since last reset or site cache invalidation', " + count + " resource(s) have been generated from back-office."); + int count = _cacheAccessCounter.getAskedResources(); + + _logger.info("Since last reset or site cache invalidation', " + count + " resource(s) have been generated from back-office."); } _siteCache.resetSitesCache();