Setting default branch to release-2.x on GitHub
Many people get confused by the default branch of the repository on GitHub. I want to make it point to `release-2.x` rather than `master`. Objections?
Re: Setting default branch to release-2.x on GitHub
Am So., 26. Dez. 2021 um 12:16 Uhr schrieb Volkan Yazıcı : > Many people get confused by the default branch of the repository on GitHub. > I want to make it point to `release-2.x` rather than `master`. Objections? While you're at that: https://logging.apache.org/log4j/2.x/source-repository.html mentions the missing 'log4j-2.17.0' branch. Best Martin
Re: Setting default branch to release-2.x on GitHub
I filed an infra ticket for this, but it hasn’t been picked up yet: https://issues.apache.org/jira/browse/INFRA-22641 Might be worth emailing someone? Otherwise they may be busy with the holidays. -ck > On Dec 26, 2021, at 06:16, Volkan Yazıcı wrote: > > Many people get confused by the default branch of the repository on GitHub. > I want to make it point to `release-2.x` rather than `master`. Objections?
Re: Setting default branch to release-2.x on GitHub
Infra has a mailing list and a slack channel. Ralph > On Dec 26, 2021, at 6:00 AM, Carter Kozak wrote: > > I filed an infra ticket for this, but it hasn’t been picked up yet: > https://issues.apache.org/jira/browse/INFRA-22641 > Might be worth emailing someone? Otherwise they may be busy with the holidays. > > -ck > >> On Dec 26, 2021, at 06:16, Volkan Yazıcı wrote: >> >> Many people get confused by the default branch of the repository on GitHub. >> I want to make it point to `release-2.x` rather than `master`. Objections?
Re: [logging-log4j2] branch release-2.x updated: LOG4J2-3289: Fix log4j-to-slf4j re-interpolation of formatted message data
Please don’t forget to apply this to the master branch Ralph > On Dec 25, 2021, at 12:20 PM, cko...@apache.org wrote: > > This is an automated email from the ASF dual-hosted git repository. > > ckozak pushed a commit to branch release-2.x > in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git > > > The following commit(s) were added to refs/heads/release-2.x by this push: > new 487588b LOG4J2-3289: Fix log4j-to-slf4j re-interpolation of > formatted message data > 487588b is described below > > commit 487588b7c34bc0b540e769d98c42d018fa1bc1b8 > Author: Carter Kozak > AuthorDate: Sat Dec 25 11:48:20 2021 -0500 > >LOG4J2-3289: Fix log4j-to-slf4j re-interpolation of formatted message data > --- > .../java/org/apache/logging/slf4j/SLF4JLogger.java | 28 ++ > .../java/org/apache/logging/slf4j/LoggerTest.java | 33 ++ > src/changes/changes.xml| 3 ++ > 3 files changed, 52 insertions(+), 12 deletions(-) > > diff --git > a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java > b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java > index 5ea8b7b..be1a15a 100644 > --- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java > +++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java > @@ -86,10 +86,13 @@ public class SLF4JLogger extends AbstractLogger { > return locationAwareLogger != null ? locationAwareLogger : logger; > } > > -private org.slf4j.Marker getMarker(final Marker marker) { > -if (marker == null) { > -return null; > -} > +private static org.slf4j.Marker getMarker(final Marker marker) { > +// No marker is provided in the common case, small methods > +// are optimized more effectively. > +return marker == null ? null : convertMarker(marker); > +} > + > +private static org.slf4j.Marker convertMarker(final Marker marker) { > final org.slf4j.Marker slf4jMarker = > MarkerFactory.getMarker(marker.getName()); > final Marker[] parents = marker.getParents(); > if (parents != null) { > @@ -222,31 +225,32 @@ public class SLF4JLogger extends AbstractLogger { > > @Override > public void logMessage(final String fqcn, final Level level, final Marker > marker, final Message message, final Throwable t) { > +org.slf4j.Marker slf4jMarker = getMarker(marker); > +String formattedMessage = message.getFormattedMessage(); > if (locationAwareLogger != null) { > if (message instanceof LoggerNameAwareMessage) { > ((LoggerNameAwareMessage) message).setLoggerName(getName()); > } > -locationAwareLogger.log(getMarker(marker), fqcn, > convertLevel(level), message.getFormattedMessage(), > -message.getParameters(), t); > +locationAwareLogger.log(slf4jMarker, fqcn, convertLevel(level), > formattedMessage, null, t); > } else { > switch (level.getStandardLevel()) { > case DEBUG : > -logger.debug(getMarker(marker), > message.getFormattedMessage(), message.getParameters(), t); > +logger.debug(slf4jMarker, formattedMessage, t); > break; > case TRACE : > -logger.trace(getMarker(marker), > message.getFormattedMessage(), message.getParameters(), t); > +logger.trace(slf4jMarker, formattedMessage, t); > break; > case INFO : > -logger.info(getMarker(marker), > message.getFormattedMessage(), message.getParameters(), t); > +logger.info(slf4jMarker, formattedMessage, t); > break; > case WARN : > -logger.warn(getMarker(marker), > message.getFormattedMessage(), message.getParameters(), t); > +logger.warn(slf4jMarker, formattedMessage, t); > break; > case ERROR : > -logger.error(getMarker(marker), > message.getFormattedMessage(), message.getParameters(), t); > +logger.error(slf4jMarker, formattedMessage, t); > break; > default : > -logger.error(getMarker(marker), > message.getFormattedMessage(), message.getParameters(), t); > +logger.error(slf4jMarker, formattedMessage, t); > break; > } > } > diff --git > a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java > b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java > index 9ba6463..0d9995c 100644 > --- a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java > +++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java > @@ -17,6 +17,8 @@ > */ > package or
Re: [logging-log4j2] branch release-2.x updated: [LOG4J2-3256] Reduce ignored package scope of KafkaAppender #640.
Please don’t forget to apply this to the master branch. Ralph > On Dec 26, 2021, at 6:31 AM, ggreg...@apache.org wrote: > > This is an automated email from the ASF dual-hosted git repository. > > ggregory pushed a commit to branch release-2.x > in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git > > > The following commit(s) were added to refs/heads/release-2.x by this push: > new aba0358 [LOG4J2-3256] Reduce ignored package scope of KafkaAppender > #640. > aba0358 is described below > > commit aba0358db59b0657dba370271768351cf97b4b5c > Author: Gary Gregory > AuthorDate: Sun Dec 26 08:30:53 2021 -0500 > >[LOG4J2-3256] Reduce ignored package scope of KafkaAppender #640. > >Modified GitHub patch #640 from Lee >Dongjin/dongjinleekr/dong...@apache.org. > --- > src/changes/changes.xml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/changes/changes.xml b/src/changes/changes.xml > index 4c96396..7f2b6ee 100644 > --- a/src/changes/changes.xml > +++ b/src/changes/changes.xml > @@ -55,7 +55,7 @@ > > Lookups with no prefix only read values from the configuration > properties as expected. > > - > + > Reduce ignored package scope of KafkaAppender. > > >
Re: Setting default branch to release-2.x on GitHub
On Sun, Dec 26, 2021 at 6:16 AM Volkan Yazıcı wrote: > Many people get confused by the default branch of the repository on GitHub. > I want to make it point to `release-2.x` rather than `master`. Objections? > +1 Gary
[Chainsaw] Removal of Log4j1
I've been looking into Chainsaw to remove Log4j1, since that is rather obsolete at this point. Unfortunately, Chainsaw is closely tied to Log4j1, as it seems that what happens is when it receives events from a source, it sends the messages to a custom LoggerRepository with a custom appender that will then show the log messages. There are also a handful of classes from the log4j1 extras package that are used as well, such as Rule. It seems to me that the proper way to do this then is to: * Copy any of the log4j1 extras classes we need into Chainsaw * Define an internal representation of log messages so that we don't depend on the log4j1 LoggingEvent class(perhaps a modified version of the log4j1 LoggingEvent) * Refactor the code so that when a log event comes in, we simply push it to whatever tab we want to see it on, instead of indirectly via log4j1. * Create a custom Appender for log4j2 so that we can still see internal Chainsaw messages within Chainsaw, and convert internal log messages to log4j2. Thoughts? -Robert Middleton
Log4j 1.x repo
The Log4j 1.x repo is now at https://github.com/apache/logging-log4j1. The default branch is now “main”, a branch off the v1_2_17 tag. Ralph
Re: Setting default branch to release-2.x on GitHub
I interpreted your comment as the branch name on the 2.17.0 site says 'log4j-2.17.0' which doesn't exist, it should be 'rel/2.17.0'. I updated pom.xml in release-2.x to use the rel/x.y.z pattern in future deploys. When the 2.17.0 site is redeployed source-repository.html will be updated with the rel/2.17.0 branch name. On Sunday, December 26, 2021, 06:48:23 AM EST, Martin Schröder wrote: Am So., 26. Dez. 2021 um 12:16 Uhr schrieb Volkan Yazıcı : > Many people get confused by the default branch of the repository on GitHub. > I want to make it point to `release-2.x` rather than `master`. Objections? While you're at that: https://logging.apache.org/log4j/2.x/source-repository.html mentions the missing 'log4j-2.17.0' branch. Best Martin
Re: Setting default branch to release-2.x on GitHub
Note that it is not the branch name that starts with "rel/", it is the tag name. Gary On Sun, Dec 26, 2021, 16:21 Ron Grabowski wrote: > I interpreted your comment as the branch name on the 2.17.0 site says > 'log4j-2.17.0' which doesn't exist, it should be 'rel/2.17.0'. I updated > pom.xml in release-2.x to use the rel/x.y.z pattern in future deploys. When > the 2.17.0 site is redeployed source-repository.html will be updated with > the rel/2.17.0 branch name. > On Sunday, December 26, 2021, 06:48:23 AM EST, Martin Schröder < > mar...@oneiros.de> wrote: > > Am So., 26. Dez. 2021 um 12:16 Uhr schrieb Volkan Yazıcı >: > > Many people get confused by the default branch of the repository on > GitHub. > > I want to make it point to `release-2.x` rather than `master`. > Objections? > > While you're at that: > https://logging.apache.org/log4j/2.x/source-repository.html mentions > the missing 'log4j-2.17.0' branch. > > Best > Martin >
Re: [Chainsaw] Removal of Log4j1
Scott has been sort of maintaining Chainsaw on his own for years. I am sure he would love new energy in the project. I think isolating it from any logging framework implementation would be a good thing. Ralph > On Dec 26, 2021, at 2:13 PM, Robert Middleton wrote: > > I've been looking into Chainsaw to remove Log4j1, since that is rather > obsolete at this point. Unfortunately, Chainsaw is closely tied to > Log4j1, as it seems that what happens is when it receives events from > a source, it sends the messages to a custom LoggerRepository with a > custom appender that will then show the log messages. > > There are also a handful of classes from the log4j1 extras package > that are used as well, such as Rule. > > It seems to me that the proper way to do this then is to: > * Copy any of the log4j1 extras classes we need into Chainsaw > * Define an internal representation of log messages so that we don't > depend on the log4j1 LoggingEvent class(perhaps a modified version of > the log4j1 LoggingEvent) > * Refactor the code so that when a log event comes in, we simply push > it to whatever tab we want to see it on, instead of indirectly via > log4j1. > * Create a custom Appender for log4j2 so that we can still see > internal Chainsaw messages within Chainsaw, and convert internal log > messages to log4j2. > > Thoughts? > > -Robert Middleton >
Re: Setting default branch to release-2.x on GitHub
Ron, you had me worried for a minute. I thought you were doing something that would affect what the release plugin does, not something in the web site. Ralph > On Dec 26, 2021, at 2:20 PM, Ron Grabowski > wrote: > > I interpreted your comment as the branch name on the 2.17.0 site says > 'log4j-2.17.0' which doesn't exist, it should be 'rel/2.17.0'. I updated > pom.xml in release-2.x to use the rel/x.y.z pattern in future deploys. When > the 2.17.0 site is redeployed source-repository.html will be updated with the > rel/2.17.0 branch name. >On Sunday, December 26, 2021, 06:48:23 AM EST, Martin Schröder > wrote: > > Am So., 26. Dez. 2021 um 12:16 Uhr schrieb Volkan Yazıcı : >> Many people get confused by the default branch of the repository on GitHub. >> I want to make it point to `release-2.x` rather than `master`. Objections? > > While you're at that: > https://logging.apache.org/log4j/2.x/source-repository.html mentions > the missing 'log4j-2.17.0' branch. > > Best > Martin