You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2016/10/14 14:13:02 UTC
svn commit: r1764906 - in /tomcat/tc8.5.x/trunk: ./
java/org/apache/catalina/ java/org/apache/catalina/core/
java/org/apache/catalina/startup/ java/org/apache/catalina/valves/rewrite/
test/org/apache/tomcat/unittest/ webapps/docs/
Author: remm
Date: Fri Oct 14 14:13:01 2016
New Revision: 1764906
URL: http://svn.apache.org/viewvc?rev=1764906&view=rev
Log:
60161: Allow creating subcategories from the container logger name. Use it for the rewrite valve.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/Container.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterHost.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 14 14:13:01 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764663,1764682,1764862,1764866-1764867,1764870
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764663,1764682,1764862,1764866-1764867,1764870,1764897
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/Container.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/Container.java?rev=1764906&r1=1764905&r2=1764906&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/Container.java Fri Oct 14 14:13:01 2016
@@ -123,6 +123,13 @@ public interface Container extends Lifec
/**
+ * Return the logger name that the container will use.
+ * @return the abbreviated name of this container for logging messages
+ */
+ public String getLogName();
+
+
+ /**
* Obtain the JMX name for this container.
*
* @return the JMX name associated with this container.
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1764906&r1=1764905&r2=1764906&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java Fri Oct 14 14:13:01 2016
@@ -357,13 +357,41 @@ public abstract class ContainerBase exte
if (logger != null)
return (logger);
- logger = LogFactory.getLog(logName());
+ logger = LogFactory.getLog(getLogName());
return (logger);
}
/**
+ * @return the abbreviated name of this container for logging messages
+ */
+ @Override
+ public String getLogName() {
+
+ if (logName != null) {
+ return logName;
+ }
+ String loggerName = null;
+ Container current = this;
+ while (current != null) {
+ String name = current.getName();
+ if ((name == null) || (name.equals(""))) {
+ name = "/";
+ } else if (name.startsWith("##")) {
+ name = "/" + name;
+ }
+ loggerName = "[" + name + "]"
+ + ((loggerName != null) ? ("." + loggerName) : "");
+ current = current.getParent();
+ }
+ logName = ContainerBase.class.getName() + "." + loggerName;
+ return logName;
+
+ }
+
+
+ /**
* Return the Cluster with which this Container is associated. If there is
* no associated Cluster, return the Cluster associated with our parent
* Container (if any); otherwise return <code>null</code>.
@@ -1183,33 +1211,6 @@ public abstract class ContainerBase exte
}
- /**
- * @return the abbreviated name of this container for logging messages
- */
- protected String logName() {
-
- if (logName != null) {
- return logName;
- }
- String loggerName = null;
- Container current = this;
- while (current != null) {
- String name = current.getName();
- if ((name == null) || (name.equals(""))) {
- name = "/";
- } else if (name.startsWith("##")) {
- name = "/" + name;
- }
- loggerName = "[" + name + "]"
- + ((loggerName != null) ? ("." + loggerName) : "");
- current = current.getParent();
- }
- logName = ContainerBase.class.getName() + "." + loggerName;
- return logName;
-
- }
-
-
// -------------------- JMX and Registration --------------------
@Override
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1764906&r1=1764905&r2=1764906&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/FailedContext.java Fri Oct 14 14:13:01 2016
@@ -241,6 +241,9 @@ public class FailedContext extends Lifec
public Log getLogger() { return null; }
@Override
+ public String getLogName() { return null; }
+
+ @Override
public Manager getManager() { return null; }
@Override
public void setManager(Manager manager) { /* NO-OP */ }
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1764906&r1=1764905&r2=1764906&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Fri Oct 14 14:13:01 2016
@@ -47,6 +47,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.URLEncoder;
import org.apache.catalina.valves.ValveBase;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.buf.UriUtil;
@@ -143,6 +144,14 @@ public class RewriteValve extends ValveB
this.enabled = enabled;
}
+
+ @Override
+ protected void initInternal() throws LifecycleException {
+ super.initInternal();
+ containerLog = LogFactory.getLog(getContainer().getLogName() + ".rewrite");
+ }
+
+
@Override
protected synchronized void startInternal() throws LifecycleException {
@@ -155,11 +164,11 @@ public class RewriteValve extends ValveB
context = true;
is = ((Context) getContainer()).getServletContext()
.getResourceAsStream("/WEB-INF/" + resourcePath);
- if (container.getLogger().isDebugEnabled()) {
+ if (containerLog.isDebugEnabled()) {
if (is == null) {
- container.getLogger().debug("No configuration resource found: /WEB-INF/" + resourcePath);
+ containerLog.debug("No configuration resource found: /WEB-INF/" + resourcePath);
} else {
- container.getLogger().debug("Read configuration from: /WEB-INF/" + resourcePath);
+ containerLog.debug("Read configuration from: /WEB-INF/" + resourcePath);
}
}
} else if (getContainer() instanceof Host) {
@@ -170,21 +179,21 @@ public class RewriteValve extends ValveB
// Use getResource and getResourceAsStream
is = getClass().getClassLoader()
.getResourceAsStream(resourceName);
- if (is != null && container.getLogger().isDebugEnabled()) {
- container.getLogger().debug("Read configuration from CL at " + resourceName);
+ if (is != null && containerLog.isDebugEnabled()) {
+ containerLog.debug("Read configuration from CL at " + resourceName);
}
} else {
- if (container.getLogger().isDebugEnabled()) {
- container.getLogger().debug("Read configuration from " + file.getAbsolutePath());
+ if (containerLog.isDebugEnabled()) {
+ containerLog.debug("Read configuration from " + file.getAbsolutePath());
}
is = new FileInputStream(file);
}
- if ((is == null) && (container.getLogger().isDebugEnabled())) {
- container.getLogger().debug("No configuration resource found: " + resourceName +
+ if ((is == null) && (containerLog.isDebugEnabled())) {
+ containerLog.debug("No configuration resource found: " + resourceName +
" in " + getConfigBase() + " or in the classloader");
}
} catch (Exception e) {
- container.getLogger().error("Error opening configuration", e);
+ containerLog.error("Error opening configuration", e);
}
}
@@ -197,12 +206,12 @@ public class RewriteValve extends ValveB
BufferedReader reader = new BufferedReader(isr)) {
parse(reader);
} catch (IOException ioe) {
- container.getLogger().error("Error closing configuration", ioe);
+ containerLog.error("Error closing configuration", ioe);
} finally {
try {
is.close();
} catch (IOException e) {
- container.getLogger().error("Error closing configuration", e);
+ containerLog.error("Error closing configuration", e);
}
}
@@ -210,6 +219,9 @@ public class RewriteValve extends ValveB
public void setConfiguration(String configuration)
throws Exception {
+ if (containerLog == null) {
+ containerLog = LogFactory.getLog(getContainer().getLogName() + ".rewrite");
+ }
maps.clear();
parse(new BufferedReader(new StringReader(configuration)));
}
@@ -238,8 +250,8 @@ public class RewriteValve extends ValveB
Object result = parse(line);
if (result instanceof RewriteRule) {
RewriteRule rule = (RewriteRule) result;
- if (container.getLogger().isDebugEnabled()) {
- container.getLogger().debug("Add rule with pattern " + rule.getPatternString()
+ if (containerLog.isDebugEnabled()) {
+ containerLog.debug("Add rule with pattern " + rule.getPatternString()
+ " and substitution " + rule.getSubstitutionString());
}
for (int i = (conditions.size() - 1); i > 0; i--) {
@@ -248,9 +260,9 @@ public class RewriteValve extends ValveB
}
}
for (int i = 0; i < conditions.size(); i++) {
- if (container.getLogger().isDebugEnabled()) {
+ if (containerLog.isDebugEnabled()) {
RewriteCond cond = conditions.get(i);
- container.getLogger().debug("Add condition " + cond.getCondPattern()
+ containerLog.debug("Add condition " + cond.getCondPattern()
+ " test " + cond.getTestString() + " to rule with pattern "
+ rule.getPatternString() + " and substitution "
+ rule.getSubstitutionString() + (cond.isOrnext() ? " [OR]" : "")
@@ -271,7 +283,7 @@ public class RewriteValve extends ValveB
}
}
} catch (IOException e) {
- container.getLogger().error("Error reading configuration", e);
+ containerLog.error("Error reading configuration", e);
}
}
this.rules = rules.toArray(new RewriteRule[0]);
@@ -338,8 +350,8 @@ public class RewriteValve extends ValveB
CharSequence test = (rule.isHost()) ? host : urlDecoded;
CharSequence newtest = rule.evaluate(test, resolver);
if (newtest != null && !test.equals(newtest.toString())) {
- if (container.getLogger().isDebugEnabled()) {
- container.getLogger().debug("Rewrote " + test + " as " + newtest
+ if (containerLog.isDebugEnabled()) {
+ containerLog.debug("Rewrote " + test + " as " + newtest
+ " with rule pattern " + rule.getPatternString());
}
if (rule.isHost()) {
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java?rev=1764906&r1=1764905&r2=1764906&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java Fri Oct 14 14:13:01 2016
@@ -116,6 +116,11 @@ public class TesterContext implements Co
}
@Override
+ public String getLogName() {
+ return null;
+ }
+
+ @Override
public ObjectName getObjectName() {
return null;
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterHost.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterHost.java?rev=1764906&r1=1764905&r2=1764906&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterHost.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterHost.java Fri Oct 14 14:13:01 2016
@@ -45,6 +45,11 @@ public class TesterHost implements Host
}
@Override
+ public String getLogName() {
+ return null;
+ }
+
+ @Override
public ObjectName getObjectName() {
return null;
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1764906&r1=1764905&r2=1764906&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Oct 14 14:13:01 2016
@@ -63,6 +63,10 @@
When calling <code>getResourceAsStream()</code> on a directory, ensure
that <code>null</code> is returned. (markt)
</fix>
+ <fix>
+ <bug>60161</bug>: Allow creating subcategories of the container logger,
+ and use it for the rewrite valve. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org