logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gary Gregory <garydgreg...@gmail.com>
Subject Re: logging-log4j2 git commit: Use the standard US English spelling for "behavior".
Date Thu, 04 Aug 2016 20:01:31 GMT
If anyone wants to revert the one commit, go ahead, I won't take it
personally ;-)

Gary

On Thu, Aug 4, 2016 at 12:43 PM, Matt Sicker <boards@gmail.com> wrote:

> I don't really care either way, I just wanted to say that I tend to spell
> things in en_GB unless it's code.
>
> On 3 August 2016 at 20:40, Gary Gregory <garydgregory@gmail.com> wrote:
>
>> For me, It's just unpolished to have a mix of styles. As I was raised in
>> France, should I start peppering code and docs with French expressions? /*
>> Zut alors! */ I prefer consistency, it could be British English, US
>> English, Proto-Bantu, whatever. I just it's lame and not very pro to have a
>> mix IMO, but hey, that's just me.
>>
>> Gary
>>
>> On Wed, Aug 3, 2016 at 4:23 PM, Remko Popma <remko.popma@gmail.com>
>> wrote:
>>
>>> We never agreed that there is any need to standardize on a particular
>>> flavour of the English language. Let's celebrate our diversity and the fact
>>> that we are a global community. I respectfully ask that this change is
>>> reverted. -Remko
>>>
>>> On Thursday, 4 August 2016, <ggregory@apache.org> wrote:
>>>
>>>> Repository: logging-log4j2
>>>> Updated Branches:
>>>>   refs/heads/master 248efa48a -> 2aeebfe4d
>>>>
>>>>
>>>> Use the standard US English spelling for "behavior".
>>>>
>>>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
>>>> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit
>>>> /2aeebfe4
>>>> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2
>>>> aeebfe4
>>>> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2
>>>> aeebfe4
>>>>
>>>> Branch: refs/heads/master
>>>> Commit: 2aeebfe4db5e0914e6fd3775d96d956d46679bc1
>>>> Parents: 248efa4
>>>> Author: Gary Gregory <ggregory@apache.org>
>>>> Authored: Wed Aug 3 15:32:03 2016 -0700
>>>> Committer: Gary Gregory <ggregory@apache.org>
>>>> Committed: Wed Aug 3 15:32:03 2016 -0700
>>>>
>>>> ----------------------------------------------------------------------
>>>>  .../src/main/java/org/apache/logging/log4j/util/Constants.java   | 2
>>>> +-
>>>>  .../logging/log4j/core/appender/MemoryMappedFileAppender.java    | 2
>>>> +-
>>>>  .../logging/log4j/core/appender/RandomAccessFileAppender.java    | 2
>>>> +-
>>>>  .../log4j/core/appender/RollingRandomAccessFileAppender.java     | 2
>>>> +-
>>>>  .../logging/log4j/core/async/AsyncQueueFullPolicyFactory.java    | 4
>>>> ++--
>>>>  .../main/java/org/apache/logging/log4j/core/util/Constants.java  | 4
>>>> ++--
>>>>  6 files changed, 8 insertions(+), 8 deletions(-)
>>>> ----------------------------------------------------------------------
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>>> aeebfe4/log4j-api/src/main/java/org/apache/logging/log4j/uti
>>>> l/Constants.java
>>>> ----------------------------------------------------------------------
>>>> diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
>>>> b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
>>>> index 2b64550..6e84d10 100644
>>>> --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Cons
>>>> tants.java
>>>> +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Cons
>>>> tants.java
>>>> @@ -31,7 +31,7 @@ public final class Constants {
>>>>              "log4j2.is.webapp", isClassAvailable("javax.servle
>>>> t.Servlet"));
>>>>
>>>>      /**
>>>> -     * Kill switch for object pooling in ThreadLocals that enables
>>>> much of the LOG4J2-1270 no-GC behaviour.
>>>> +     * Kill switch for object pooling in ThreadLocals that enables
>>>> much of the LOG4J2-1270 no-GC behavior.
>>>>       * <p>
>>>>       * {@code True} for non-{@link #IS_WEB_APP web apps}, disable by
>>>> setting system property
>>>>       * "log4j2.enable.threadlocals" to "false".
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>>> aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/co
>>>> re/appender/MemoryMappedFileAppender.java
>>>> ----------------------------------------------------------------------
>>>> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/MemoryMappedFileAppender.java b/log4j-core/src/main/java/org
>>>> /apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
>>>> index 0949ffd..3270e29 100644
>>>> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/MemoryMappedFileAppender.java
>>>> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/MemoryMappedFileAppender.java
>>>> @@ -81,7 +81,7 @@ public final class MemoryMappedFileAppender extends
>>>> AbstractOutputStreamAppender
>>>>      @Override
>>>>      public void append(final LogEvent event) {
>>>>
>>>> -        // Leverage the nice batching behaviour of async
>>>> Loggers/Appenders:
>>>> +        // Leverage the nice batching behavior of async
>>>> Loggers/Appenders:
>>>>          // we can signal the file manager that it needs to flush the
>>>> buffer
>>>>          // to disk at the end of a batch.
>>>>          // From a user's point of view, this means that all log events
>>>> are
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>>> aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/co
>>>> re/appender/RandomAccessFileAppender.java
>>>> ----------------------------------------------------------------------
>>>> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org
>>>> /apache/logging/log4j/core/appender/RandomAccessFileAppender.java
>>>> index 738816d..dcceb0d 100644
>>>> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/RandomAccessFileAppender.java
>>>> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/RandomAccessFileAppender.java
>>>> @@ -77,7 +77,7 @@ public final class RandomAccessFileAppender extends
>>>> AbstractOutputStreamAppender
>>>>      @Override
>>>>      public void append(final LogEvent event) {
>>>>
>>>> -        // Leverage the nice batching behaviour of async
>>>> Loggers/Appenders:
>>>> +        // Leverage the nice batching behavior of async
>>>> Loggers/Appenders:
>>>>          // we can signal the file manager that it needs to flush the
>>>> buffer
>>>>          // to disk at the end of a batch.
>>>>          // From a user's point of view, this means that all log events
>>>> are
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>>> aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/co
>>>> re/appender/RollingRandomAccessFileAppender.java
>>>> ----------------------------------------------------------------------
>>>> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/RollingRandomAccessFileAppender.java
>>>> b/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/RollingRandomAccessFileAppender.java
>>>> index 67777e6..2f8c805 100644
>>>> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/RollingRandomAccessFileAppender.java
>>>> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/app
>>>> ender/RollingRandomAccessFileAppender.java
>>>> @@ -87,7 +87,7 @@ public final class RollingRandomAccessFileAppender
>>>> extends AbstractOutputStreamA
>>>>          final RollingRandomAccessFileManager manager = getManager();
>>>>          manager.checkRollover(event);
>>>>
>>>> -        // Leverage the nice batching behaviour of async
>>>> Loggers/Appenders:
>>>> +        // Leverage the nice batching behavior of async
>>>> Loggers/Appenders:
>>>>          // we can signal the file manager that it needs to flush the
>>>> buffer
>>>>          // to disk at the end of a batch.
>>>>          // From a user's point of view, this means that all log events
>>>> are
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>>> aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/co
>>>> re/async/AsyncQueueFullPolicyFactory.java
>>>> ----------------------------------------------------------------------
>>>> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/asy
>>>> nc/AsyncQueueFullPolicyFactory.java b/log4j-core/src/main/java/org
>>>> /apache/logging/log4j/core/async/AsyncQueueFullPolicyFactory.java
>>>> index 534a899..e8d7d5c 100644
>>>> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/asy
>>>> nc/AsyncQueueFullPolicyFactory.java
>>>> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/asy
>>>> nc/AsyncQueueFullPolicyFactory.java
>>>> @@ -27,7 +27,7 @@ import org.apache.logging.log4j.util.PropertiesUtil;
>>>>   * created by this factory is used in AsyncLogger, AsyncLoggerConfig
>>>> and AsyncAppender
>>>>   * to control if events are logged in the current thread, the
>>>> background thread, or discarded.
>>>>   * <p>
>>>> - * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the routing
>>>> behaviour. If this property is not specified or has
>>>> + * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the routing
>>>> behavior. If this property is not specified or has
>>>>   * value {@code "Default"}, this factory creates {@link
>>>> DefaultAsyncQueueFullPolicy} objects.
>>>>   * </p> <p>
>>>>   * If this property has value {@code "Discard"}, this factory creates
>>>> {@link DiscardingAsyncQueueFullPolicy} objects.
>>>> @@ -53,7 +53,7 @@ public class AsyncQueueFullPolicyFactory {
>>>>      /**
>>>>       * Creates and returns {@link AsyncQueueFullPolicy} instances
>>>> based on user-specified system properties.
>>>>       * <p>
>>>> -     * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the
>>>> routing behaviour. If this property is not specified or
>>>> +     * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the
>>>> routing behavior. If this property is not specified or
>>>>       * has value {@code "Default"}, this method returns {@link
>>>> DefaultAsyncQueueFullPolicy} objects.
>>>>       * </p> <p>
>>>>       * If this property has value {@code "Discard"}, this method
>>>> returns {@link DiscardingAsyncQueueFullPolicy} objects.
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>>> aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/co
>>>> re/util/Constants.java
>>>> ----------------------------------------------------------------------
>>>> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java
>>>> b/log4j-core/src/main/java/org/apache/logging/log4j/core/uti
>>>> l/Constants.java
>>>> index 09ec0bb..ab10360 100644
>>>> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/uti
>>>> l/Constants.java
>>>> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/uti
>>>> l/Constants.java
>>>> @@ -79,7 +79,7 @@ public final class Constants {
>>>>      public static final boolean IS_WEB_APP =
>>>> org.apache.logging.log4j.util.Constants.IS_WEB_APP;
>>>>
>>>>      /**
>>>> -     * Kill switch for object pooling in ThreadLocals that enables
>>>> much of the LOG4J2-1270 no-GC behaviour.
>>>> +     * Kill switch for object pooling in ThreadLocals that enables
>>>> much of the LOG4J2-1270 no-GC behavior.
>>>>       * <p>
>>>>       * {@code True} for non-{@link #IS_WEB_APP web apps}, disable by
>>>> setting system property
>>>>       * "log4j2.enable.threadlocals" to "false".
>>>> @@ -89,7 +89,7 @@ public final class Constants {
>>>>      public static final boolean ENABLE_THREADLOCALS =
>>>> org.apache.logging.log4j.util.Constants.ENABLE_THREADLOCALS;
>>>>
>>>>      /**
>>>> -     * Kill switch for garbage-free Layout behaviour that encodes
>>>> LogEvents directly into
>>>> +     * Kill switch for garbage-free Layout behavior that encodes
>>>> LogEvents directly into
>>>>       * {@link org.apache.logging.log4j.core.layout.ByteBufferDestination}s
>>>> without creating intermediate temporary
>>>>       * Objects.
>>>>       * <p>
>>>>
>>>>
>>
>>
>> --
>> E-Mail: garydgregory@gmail.com | ggregory@apache.org
>> Java Persistence with Hibernate, Second Edition
>> <http://www.manning.com/bauer3/>
>> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
>> Spring Batch in Action <http://www.manning.com/templier/>
>> Blog: http://garygregory.wordpress.com
>> Home: http://garygregory.com/
>> Tweet! http://twitter.com/GaryGregory
>>
>
>
>
> --
> Matt Sicker <boards@gmail.com>
>



-- 
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory

Mime
View raw message